Albert ARIBAUD 009d75ccc1 Merge branch 'u-boot/master' into 'u-boot-arm/master' ... Conflicts: drivers/spi/tegra20_sflash.c include/fdtdec.h lib/fdtdec.c		2013-03-28 18:50:01 +01:00
..
arm	armv7: do not relocate _start twice	2013-03-28 10:15:06 +01:00
avr32	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00
blackfin	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00
m68k	Declare watchdog functions in watchdog.h	2013-03-15 16:13:59 -04:00
microblaze	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00
mips	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00
nds32	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00
nios2	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00
openrisc	Introduce generic link section.h symbol files	2013-03-15 16:13:58 -04:00
powerpc	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00
sandbox	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00
sh	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00
sparc	sparc: Fix build warnings in serial.c	2013-03-15 16:14:02 -04:00
x86	x86: Move PCI init before SPI init	2013-03-19 08:45:37 -07:00
.gitignore