u-boot/arch/arm/include/asm/arch-omap5
Tom Rini fbbbc86e8e Merge branch 'master' of git://git.denx.de/u-boot-arm
Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.

Conflicts:
	arch/arm/dts/exynos5250.dtsi

Signed-off-by: Tom Rini <trini@ti.com>
2013-07-12 10:36:48 -04:00
..
clock.h OMAP5: Enable access to auxclk registers 2013-06-10 08:54:46 -04:00
cpu.h ARM: OMAP4+: Cleanup header files 2013-06-10 08:43:09 -04:00
gpio.h ARM: OMAP: GPIO: Fix valid range and enable usage of all GPIOs on OMAP5 2013-07-02 09:21:16 -04:00
i2c.h OMAP5: I2C: Set I2C_BUS_MAX to 5 to enable I2C4 and I2C5 2013-05-10 08:25:55 -04:00
mmc_host_def.h omap: consolidate common mmc definitions 2013-03-08 16:41:12 -05:00
mux_dra7xx.h ARM: DRA7xx: Update pinmux data 2013-06-10 08:43:10 -04:00
mux_omap5.h arm: dra7xx: Add board files for DRA7XX socs 2013-03-11 11:39:30 -04:00
omap.h Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-06-13 15:16:15 -04:00
spl.h OMAP3/4/5/AM33xx: Correct logic for checking FAT or RAW MMC 2013-04-08 11:29:34 -04:00
sys_proto.h ARM: DRA7xx: power Add support for tps659038 PMIC 2013-06-10 08:43:09 -04:00