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)
commit56952baa9b6f6bc06437abd51baefc4f7c8dee3b
treeda0ddfda65137a591a695a0648ee8160922f8eb6
parent5698bd757d55b1bb87edd1a9744ab09c142abfc2
parent011527b45f8e3092e1f3192e5aea94187a6ca269
parentfae9659a2cabcdaa01ea5a87568677e5cb037478
Merge branches 'next/pinctrl-samsung' and 'next/board-samsung' into next/dt-samsung-new

Conflicts:
arch/arm/mach-exynos/mach-smdkv310.c
arch/arm/mach-exynos/Kconfig
arch/arm/mach-exynos/mach-origen.c
arch/arm/mach-exynos/mach-smdkv310.c