Files
u-boot/arch/arm/include/asm
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
..
2012-03-26 23:09:26 +02:00
2012-11-10 08:15:40 +01:00
2012-11-16 09:16:45 +01:00
2012-09-18 12:01:51 -07:00
2011-07-16 13:00:11 +02:00
2011-11-29 15:43:38 +01:00
2013-02-04 09:05:45 -05:00
2011-02-21 08:30:55 +01:00
2012-05-15 08:31:26 +02:00
2012-11-20 00:16:08 +01:00
2011-07-04 10:55:25 +02:00
2010-10-13 09:59:33 +02:00
2013-02-03 14:43:58 +01:00