u-boot/arch
Tom Rini fbbbc86e8e Merge branch 'master' of git://git.denx.de/u-boot-arm
Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.

Conflicts:
	arch/arm/dts/exynos5250.dtsi

Signed-off-by: Tom Rini <trini@ti.com>
2013-07-12 10:36:48 -04:00
..
arm Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-07-12 10:36:48 -04:00
avr32 avr32/m68k/microblaze/nds32/nios2/openrisc/sh/sparc: fix do_bootm_linux 2013-07-02 09:17:17 -04:00
blackfin blackfin: x86: bootm: Handle PREP stage of bootm 2013-07-12 10:32:39 -04:00
m68k avr32/m68k/microblaze/nds32/nios2/openrisc/sh/sparc: fix do_bootm_linux 2013-07-02 09:17:17 -04:00
microblaze avr32/m68k/microblaze/nds32/nios2/openrisc/sh/sparc: fix do_bootm_linux 2013-07-02 09:17:17 -04:00
mips MIPS: asm/errno.h: switch to asm-generic/errno.h 2013-06-08 23:10:10 +02:00
nds32 avr32/m68k/microblaze/nds32/nios2/openrisc/sh/sparc: fix do_bootm_linux 2013-07-02 09:17:17 -04:00
nios2 avr32/m68k/microblaze/nds32/nios2/openrisc/sh/sparc: fix do_bootm_linux 2013-07-02 09:17:17 -04:00
openrisc avr32/m68k/microblaze/nds32/nios2/openrisc/sh/sparc: fix do_bootm_linux 2013-07-02 09:17:17 -04:00
powerpc Fix bootm to work on powerpc again (compressed uImage) 2013-06-28 16:26:52 -04:00
sandbox sandbox: Support trace feature 2013-06-26 10:16:41 -04:00
sh avr32/m68k/microblaze/nds32/nios2/openrisc/sh/sparc: fix do_bootm_linux 2013-07-02 09:17:17 -04:00
sparc avr32/m68k/microblaze/nds32/nios2/openrisc/sh/sparc: fix do_bootm_linux 2013-07-02 09:17:17 -04:00
x86 blackfin: x86: bootm: Handle PREP stage of bootm 2013-07-12 10:32:39 -04:00
.gitignore update include/asm/ gitignore after move 2010-05-07 00:17:30 +02:00