Merge branches 'next/pinctrl-samsung' and 'next/board-samsung' into next/dt-samsung-new
authorKukjin Kim <kgene.kim@samsung.com>
Sat, 22 Sep 2012 03:11:21 +0000 (12:11 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 22 Sep 2012 03:11:21 +0000 (12:11 +0900)
Conflicts:
arch/arm/mach-exynos/mach-smdkv310.c


Trivial merge