Files
u-boot-tk1-som/common
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-11-04 11:00:35 -07:00
2012-10-03 16:01:22 -07:00
2012-11-04 11:00:35 -07:00
2012-11-04 11:00:35 -07:00
2012-10-15 11:53:07 -07:00
2011-10-22 01:22:21 +02:00
2012-11-04 11:00:35 -07:00
2013-02-20 08:52:29 -05:00
2012-11-04 11:00:35 -07:00
2012-11-04 11:00:34 -07:00
2012-11-04 11:00:34 -07:00
2012-11-04 11:00:35 -07:00
2012-11-04 11:00:35 -07:00
2012-11-04 11:00:34 -07:00
2012-12-11 13:17:33 -07:00
2013-02-20 08:52:41 -05:00
2012-11-04 11:00:35 -07:00
2012-11-04 11:00:35 -07:00
2012-11-04 11:00:35 -07:00
2011-04-08 00:44:27 -04:00
2011-07-28 16:41:06 +02:00
2012-11-04 11:00:35 -07:00
2013-02-28 19:49:11 -08:00
2012-11-04 11:00:35 -07:00
2012-11-04 11:00:35 -07:00
2012-11-04 11:00:35 -07:00
2012-11-04 11:00:35 -07:00
2012-09-27 12:22:11 -05:00
2012-11-04 11:00:35 -07:00
2012-12-19 15:51:57 -07:00
2013-01-08 10:54:33 +09:00
2012-11-04 11:00:35 -07:00
2012-11-04 11:00:35 -07:00
2012-12-11 13:18:13 -07:00
2012-08-09 23:39:18 +02:00
2012-12-13 11:46:56 -07:00
2012-12-11 13:17:34 -07:00
2011-12-07 08:41:22 +01:00
2011-02-02 22:36:10 +01:00
2010-01-18 00:23:00 +01:00
2011-10-22 01:13:35 +02:00
2012-11-04 11:00:36 -07:00
2012-11-04 11:00:35 -07:00