]> git.sur5r.net Git - u-boot/commit
Merge u-boot/master into u-boot-ti/master
authorTom Rini <trini@ti.com>
Mon, 11 Mar 2013 16:02:40 +0000 (12:02 -0400)
committerTom Rini <trini@ti.com>
Mon, 11 Mar 2013 16:16:13 +0000 (12:16 -0400)
commit76b40ab41eff1f402ee52ba768b09daad293b9bb
tree4956296adbdc8939aa49d84fa9bd497eef65b7f4
parentde62688bb61c499ecc2d70a3aa8ccf90bb7a8ef6
parentfc959081d41aab2d6f4614c5fb3dd1b77ffcdcf4
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>
MAINTAINERS
README
arch/arm/include/asm/arch-davinci/gpio.h
board/technexion/twister/twister.c
board/timll/devkit8000/devkit8000.c
boards.cfg
drivers/gpio/da8xx_gpio.c
drivers/mmc/bfin_sdh.c
include/configs/ea20.h