]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/board-samsung' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Mon, 17 Sep 2012 21:36:21 +0000 (07:06 +0930)
committerKukjin Kim <kgene.kim@samsung.com>
Mon, 17 Sep 2012 21:36:21 +0000 (07:06 +0930)
commit04606afc169cccc8dfbf22b00726e8a922b64a29
treea7dbd194ce88a8142e0c37ad823aa8f0a9c0ac8f
parentf600e95260cb9056250221a078f3e3a61e9112fb
parentfae9659a2cabcdaa01ea5a87568677e5cb037478
Merge branch 'next/board-samsung' into for-next

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-smdk4x12.c
arch/arm/mach-exynos/mach-smdkv310.c
arch/arm/mach-s3c64xx/mach-crag6410.c