ARM: Merge for-2635/defconfig3
authorBen Dooks <ben-linux@fluff.org>
Fri, 28 May 2010 10:34:02 +0000 (19:34 +0900)
committerBen Dooks <ben-linux@fluff.org>
Fri, 28 May 2010 10:34:02 +0000 (19:34 +0900)
Merge branch 'for-2635/defconfig3' into for-linus/2635-updates


Trivial merge