[U-Boot] [PATCH v3 07/19] arm: socfpga: Add clock driver for Arria 10

[Ley Foon Tan]

On Fri, Mar 31, 2017 at 6:30 PM, Marek Vasut <marex at 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.chee at intel.com>
>> Signed-off-by: Ley Foon Tan <ley.foon.tan at 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