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-06-26 10:18:56 -04:00
2012-12-06 13:56:38 -07:00
2013-07-03 09:35:30 -04:00
2012-05-25 09:15:10 +02:00
2012-11-04 11:00:36 -07:00
2012-05-15 08:31:37 +02:00
2010-04-13 09:13:04 +02:00
2010-04-13 09:13:04 +02:00
2010-04-13 09:13:04 +02:00
2010-04-13 09:13:04 +02:00
2010-04-13 09:13:04 +02:00
2010-04-13 09:13:04 +02:00
2010-04-13 09:13:04 +02:00
2011-01-18 23:38:08 +01:00
2010-04-13 09:13:04 +02:00
2010-11-28 21:58:29 +01:00
2010-04-21 23:42:38 +02:00
2010-09-19 19:29:47 +02:00
2012-03-29 08:12:47 +02:00
2012-09-29 07:26:08 -07:00
2013-05-01 16:41:08 -04:00
2010-04-13 09:13:04 +02:00
2010-04-13 09:13:04 +02:00
2013-06-26 10:16:41 -04:00
2012-04-29 14:14:08 +02:00
2010-11-28 21:56:39 +01:00
2012-07-07 14:07:32 +02:00
2010-04-13 09:13:04 +02:00
2013-05-31 17:12:03 -05:00
2012-04-10 23:35:32 +02:00
2013-04-12 14:13:13 -07:00
2013-06-26 10:16:41 -04:00