Merge branch 'next-s5p' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Fri, 11 Mar 2011 02:05:49 +0000 (11:05 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Fri, 11 Mar 2011 02:05:49 +0000 (11:05 +0900)

Trivial merge