1
0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Files
u-boot-megous/drivers/net
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
..
2013-02-28 19:09:23 -08:00
2012-09-24 13:17:24 -05:00
2012-05-22 10:18:15 -05:00
2012-10-26 22:38:00 +02:00
2012-12-15 12:28:24 -06:00
2012-12-15 12:28:24 -06:00
2012-11-04 11:00:36 -07:00
2012-09-26 12:36:32 -05:00