Files
u-boot-tk1-som/board
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-12-05 17:31:23 +01:00
2011-11-27 19:44:21 +01:00
2010-12-09 10:25:56 +01:00
2013-01-17 09:07:34 -07:00
2012-02-12 15:03:25 -05:00
2011-10-15 22:20:36 +02:00
2013-02-08 22:32:38 -05:00
2013-01-17 09:07:34 -07:00
2010-12-09 10:25:56 +01:00
2010-12-09 10:25:56 +01:00
2011-10-15 22:20:36 +02:00
2012-12-17 15:38:14 +01:00
2012-10-15 11:54:14 -07:00
2011-10-15 22:20:36 +02:00
2011-10-15 22:20:36 +02:00
2012-03-26 23:09:23 +02:00
2011-10-15 22:20:36 +02:00
2010-12-09 10:25:56 +01:00
2010-12-09 10:25:56 +01:00
2010-11-28 21:45:32 +01:00
2012-02-12 15:03:25 -05:00
2012-10-04 16:59:13 +02:00
2011-10-15 22:20:36 +02:00