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
..
2011-07-25 23:40:11 +02:00
2013-03-25 09:56:07 -07:00
2013-04-01 16:33:52 -04:00
2013-03-19 08:45:36 -07:00