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-05-24 16:54:12 -05:00
2013-04-01 16:33:52 -04:00
2013-06-24 19:11:17 -05:00
2011-01-09 18:06:50 +01:00
2013-04-01 16:33:52 -04:00
2013-04-01 16:33:52 -04:00
2010-07-12 00:14:29 -07:00
2012-05-22 10:18:15 -05:00
2013-04-01 16:33:52 -04:00
2013-04-01 16:33:52 -04:00
2013-04-01 16:33:52 -04:00
2010-01-31 22:37:12 -08:00
2013-07-12 09:29:32 +02:00
2011-04-20 15:09:34 -05:00
2013-06-24 19:11:16 -05:00
2013-06-24 19:11:16 -05:00
2013-06-24 19:10:15 -05:00
2013-06-24 19:10:15 -05:00
2013-04-01 16:33:52 -04:00
2008-05-21 00:14:08 +02:00
2012-12-15 12:28:24 -06:00
2012-12-15 12:28:24 -06:00
2013-05-15 08:41:03 -04:00
2012-11-04 11:00:36 -07:00