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-03-26 23:09:26 +02:00
2013-06-26 17:34:21 +02:00
2013-04-28 11:07:41 +02:00
2011-07-16 13:00:11 +02:00
2013-05-14 15:37:25 -04:00
2011-11-29 15:43:38 +01:00
2011-02-21 08:30:55 +01:00
2012-05-15 08:31:26 +02:00
2013-04-12 07:55:08 +02:00
2012-11-20 00:16:08 +01:00
2011-07-04 10:55:25 +02:00
2010-10-13 09:59:33 +02:00
2013-03-15 16:13:54 -04:00
2013-03-15 16:14:00 -04:00