3 Apr
2017
3 Apr
'17
7:47 a.m.
On Fri, Mar 31, 2017 at 6:30 PM, Marek Vasut marex@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@intel.com Signed-off-by: Ley Foon Tan ley.foon.tan@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