ARM: Merge next-samsung-devupdates2
authorBen Dooks <ben-linux@fluff.org>
Wed, 3 Feb 2010 01:55:39 +0000 (01:55 +0000)
committerBen Dooks <ben-linux@fluff.org>
Wed, 3 Feb 2010 01:55:39 +0000 (01:55 +0000)
Merge branch 'next-samsung-devupdates2' into next-samsung


Trivial merge