Re: [U-Boot] Conflict between mainline and ARM trees on davinci

2013-03-11 Thread Tom Rini
On Mon, Mar 11, 2013 at 10:38:21AM +0100, Albert ARIBAUD wrote: > Hello, > > There is merge conflict between mainline and ARM trees on davinci gpio, > between > > commit 03414ac45e119496e2475aeacbb968bb67da24f8 > gpio: Build the da8xx_gpio code for the davinci644x device > (mai

[U-Boot] Conflict between mainline and ARM trees on davinci

2013-03-11 Thread Albert ARIBAUD
Hello, There is merge conflict between mainline and ARM trees on davinci gpio, between commit 03414ac45e119496e2475aeacbb968bb67da24f8 gpio: Build the da8xx_gpio code for the davinci644x device (mainline) and commit b9f56698c7e9bf7ac773b5346c4f6886e214b69b