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)
Conflicts:
arch/arm/mach-s5pv210/mach-smdkv210.c


Trivial merge