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
..
2013-03-29 14:29:39 +01:00
2012-07-08 22:15:08 +02:00
2012-11-06 22:24:11 +01:00
2011-10-13 12:26:30 +02:00
2013-05-06 17:40:22 +02:00
2010-10-22 00:05:05 +02:00
2011-08-04 23:34:02 +02:00
2011-08-04 23:34:02 +02:00
2013-03-21 10:16:53 +01:00