Merge branch 'next-s5p' into for-next-new
authorKukjin Kim <kgene.kim@samsung.com>
Thu, 30 Dec 2010 01:44:13 +0000 (10:44 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Thu, 30 Dec 2010 01:44:13 +0000 (10:44 +0900)

Trivial merge