ARM: Merge for-2635/s5p-general
authorBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:04:03 +0000 (18:04 +0900)
committerBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:04:03 +0000 (18:04 +0900)
Merge branch 'for-2635/s5p-general' into for-linus/samsung2


Trivial merge