]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'u-boot/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 28 Mar 2013 17:50:01 +0000 (18:50 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 28 Mar 2013 17:50:01 +0000 (18:50 +0100)
Conflicts:
drivers/spi/tegra20_sflash.c
include/fdtdec.h
lib/fdtdec.c


No differences found