Merge branch 'next-footbridge' of git://aeryn.fluff.org.uk/bjdooks/linux
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 8 Jan 2009 22:01:34 +0000 (22:01 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 8 Jan 2009 22:01:34 +0000 (22:01 +0000)

Trivial merge