Merge branch 'next-s5p6442' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Fri, 6 Aug 2010 12:31:21 +0000 (21:31 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Fri, 6 Aug 2010 12:31:21 +0000 (21:31 +0900)

Trivial merge