ARM: Merge next-samsung-devupdates1
authorBen Dooks <ben-linux@fluff.org>
Tue, 19 Jan 2010 08:48:35 +0000 (17:48 +0900)
committerBen Dooks <ben-linux@fluff.org>
Tue, 19 Jan 2010 08:48:35 +0000 (17:48 +0900)
Merge branch 'next-samsung-devupdates1' into next-samsung-try5


Trivial merge