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)
commit2520123382e97271e932377c83bca010c265be55
tree1403c6c4ea400be832322cd84acee93cd49076e7
parentbe4ab3616839c26caf914449de3a22458f53f6e5
parent699efdd2d34c535f415516e06d3d9f0bed131664
Merge branch 'next-samsung-board-v3.1' into next-samsung-board

Conflicts:
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/Makefile