On Fri, Mar 31, 2017 at 6:30 PM, Marek Vasut <ma...@denx.de> wrote: > On 03/30/2017 03:08 PM, Ley Foon Tan wrote: >> Add clock driver support for Arria 10. >> >> Signed-off-by: Tien Fong Chee <tien.fong.c...@intel.com> >> Signed-off-by: Ley Foon Tan <ley.foon....@intel.com> >> >> Conflicts: >> arch/arm/mach-socfpga/clock_manager.c > > ^ what's this "conflicts" about ? > It was leave over from git rebase, will remove it.
Regards Ley Foon _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
