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

Trivial merge