Merge branch 'next-samsung-board-v3.1' into next-samsung-board
authorKukjin Kim <kgene.kim@samsung.com>
Fri, 16 Sep 2011 08:13:09 +0000 (17:13 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Fri, 16 Sep 2011 08:13:09 +0000 (17:13 +0900)
Conflicts:
arch/arm/mach-exynos4/Kconfig


Trivial merge