Merge branch 'next-s5pv310' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Mon, 3 Jan 2011 09:59:54 +0000 (18:59 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Mon, 3 Jan 2011 09:59:54 +0000 (18:59 +0900)
Conflicts:
arch/arm/mach-s5pv310/Makefile


Trivial merge