u-boot/board/samsung
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
..
common EXYNOS: LDS file move to common 2013-07-05 17:06:54 +09:00
dts Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-07-12 10:36:48 -04:00
goni arm:goni:pmic: Adjust GONI target platform board to new PMIC framework 2012-11-14 11:21:12 +01:00
origen EXYNOS: Move files from board/samsung to arch/arm 2013-07-05 17:06:55 +09:00
smdk2410 punt unused clean/distclean targets 2011-10-15 22:20:36 +02:00
smdk5250 Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-07-12 10:36:48 -04:00
smdkc100 IPL: Remove remains of OneNAND IPL 2012-09-18 12:01:51 -07:00
smdkv310 EXYNOS: Move files from board/samsung to arch/arm 2013-07-05 17:06:55 +09:00
trats video: exynos_fb: Remove callbacks from the driver 2013-03-27 21:17:12 +09:00
universal_c210 video: exynos_fb: Remove callbacks from the driver 2013-03-27 21:17:12 +09:00