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
..
2012-06-19 22:33:55 +02:00
2013-06-26 10:16:41 -04:00
2012-10-15 11:54:04 -07:00
2005-07-21 11:22:21 +02:00
2009-11-24 23:43:18 +01:00
2012-07-20 08:53:34 +02:00
2012-07-20 08:53:34 +02:00
2009-04-28 01:16:46 +02:00
2013-07-03 09:35:37 -04:00