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-11-27 19:44:21 +01:00
2013-04-01 16:33:52 -04:00
2010-12-09 10:25:56 +01:00
2013-04-01 16:33:52 -04:00
2013-04-01 16:33:52 -04:00
2012-02-12 15:03:25 -05:00
2011-10-15 22:20:36 +02:00
2013-02-08 22:32:38 -05:00
2010-12-09 10:25:56 +01:00
2010-12-09 10:25:56 +01:00
2013-06-21 23:04:05 +02:00
2013-04-01 16:33:52 -04:00
2011-10-15 22:20:36 +02:00
2013-04-01 16:33:52 -04:00
2013-04-01 16:33:52 -04:00
2013-05-05 23:47:05 +02:00
2012-10-15 11:54:14 -07:00
2011-10-15 22:20:36 +02:00
2011-10-15 22:20:36 +02:00
2012-03-26 23:09:23 +02:00
2013-04-22 09:53:53 +02:00
2013-04-01 16:33:52 -04:00
2011-10-15 22:20:36 +02:00
2010-12-09 10:25:56 +01:00
2010-12-09 10:25:56 +01:00
2010-11-28 21:45:32 +01:00
2012-02-12 15:03:25 -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
2012-10-04 16:59:13 +02:00
2013-05-05 17:55:03 +02:00
2011-10-15 22:20:36 +02:00
2013-06-21 23:04:05 +02:00
2013-06-26 16:14:32 +02:00