Merge branches 'at91-fixes' and 'pxa-fixes'
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 29 Nov 2007 20:57:19 +0000 (20:57 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 29 Nov 2007 20:57:19 +0000 (20:57 +0000)

Trivial merge