| commit | 9dbc836ba58c464f347de13a69be960fd1d7c201 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Mon Mar 11 12:02:40 2013 -0400 |
| committer | Tom Rini <trini@ti.com> | Mon Mar 11 12:16:13 2013 -0400 |
| tree | 4956296adbdc8939aa49d84fa9bd497eef65b7f4 | |
| parent | 43c296f13a9511b91ce7f84f14fea43de50e0b0d [diff] | |
| parent | 5042213e9dfb06755c0ab3850f7a229b28d7c197 [diff] |
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>