Hi Stefano,
On Sat, 08 Dec 2012 15:16:39 +0100, Stefano Babic sbabic@denx.de wrote:
Hi Albert,
please pull from u-boot-imx, master. Conflicts are fixed, request pull is generated from u-boot/master, as I merged it (so you see also the commits you have already merged into u-boot-arm from my previous pull request):
The following changes since commit fd4d564b3c80b111f18c93adb14233a6a7ddb0e9:
Merge branch 'master' of git://git.denx.de/u-boot-x86 (2012-12-07 08:47:59 -0700)
are available in the git repository at:
git://www.denx.de/git/u-boot-imx.git master
for you to fetch changes up to 05a860c228fe6c8f2e7aced8cc8ef88bc1038363:
Merge branch 'master' of git://git.denx.de/u-boot into master (2012-12-08 12:02:45 +0100)
Hmm, your request says master but the 'up to' points to 'master merge'. As master has a few more commits including changes to woodburn boards that makes them use the new power interface, I guess I should ignore the 'up to' and simply use master (b874df74...)?
Amicalement,