]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/board-samsung' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Thu, 20 Sep 2012 22:47:49 +0000 (07:47 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Thu, 20 Sep 2012 22:47:49 +0000 (07:47 +0900)
commite3d6853d4b2379076ee7913f650295411e6164de
tree8052440956f63eb5059daac2ac3702e363e169aa
parent3367eccda3afbb42314747ad3a6b48db2c6f9b5d
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-smdkv310.c