Merge branch 'next-s5pv210' into for-next-new
authorKukjin Kim <kgene.kim@samsung.com>
Thu, 30 Dec 2010 01:52:32 +0000 (10:52 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Thu, 30 Dec 2010 01:52:32 +0000 (10:52 +0900)
commit0ae9a22b45b9e9d0f6058e5257b2daf48036dd35
tree9f7b388ab5eef34f00f4a4c7e476c61cc17d5bdc
parent5ed76f3d98ffb6ebd754fc7c4cae547d6ffed5ff
parent8f49720d5afb42dc7c0ced2cd94d561fbe9560d9
Merge branch 'next-s5pv210' into for-next-new

Conflicts:
arch/arm/mach-s5pv210/mach-smdkv210.c
arch/arm/mach-s5pv210/mach-smdkv210.c