Tom Rini 76b40ab41e Merge u-boot/master into u-boot-ti/master ... In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>		2013-03-11 12:16:13 -04:00
..
arm	Merge u-boot/master into u-boot-ti/master	2013-03-11 12:16:13 -04:00
avr32	malloc: make malloc_bin_reloc static	2013-02-19 17:01:26 -05:00
blackfin	blackfin: bf60x: add resume from hibernate	2013-03-04 13:42:08 +08:00
m68k	malloc: make malloc_bin_reloc static	2013-02-19 17:01:26 -05:00
microblaze	Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze	2013-02-04 09:14:22 -05:00
mips	MIPS: board.c: remove manual relocation of env_name_spec	2013-02-15 18:00:04 +01:00
nds32	malloc: make malloc_bin_reloc static	2013-02-19 17:01:26 -05:00
nios2	Clean up libfdt.h includes	2013-02-08 22:32:38 -05:00
openrisc	openrisc: Use generic global_data	2013-02-04 09:05:46 -05:00
powerpc	Clean up libfdt.h includes	2013-02-08 22:32:38 -05:00
sandbox	sandbox: Add a way of obtaining directory listings	2013-03-04 14:19:56 -05:00
sh	sh: Use generic global_data	2013-02-04 09:05:46 -05:00
sparc	malloc: make malloc_bin_reloc static	2013-02-19 17:01:26 -05:00
x86	x86: Add error checking to x86 relocation code	2013-03-04 15:57:48 -08:00
.gitignore	update include/asm/ gitignore after move	2010-05-07 00:17:30 +02:00