]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'v3.11-next/remove-nondt-exynos-3' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Tue, 18 Jun 2013 19:16:18 +0000 (04:16 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Tue, 18 Jun 2013 19:16:18 +0000 (04:16 +0900)
commit867984e160c1b8cbbbed2402f79d29dda0590796
treea8f665452c78ad1982d9db77959103560067bb6f
parent54133b7309582f94f4b5f3a689e2e4374298a790
parent564d06b1266ee62c9b47eab8305755e5ff6e38d5
Merge branch 'v3.11-next/remove-nondt-exynos-3' into for-next

Conflicts:
arch/arm/Kconfig
arch/arm/mach-exynos/Kconfig
arch/arm/Kconfig
arch/arm/mach-exynos/Kconfig
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile