Merge branch 'pxa-fixes'
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 8 Dec 2007 14:41:29 +0000 (14:41 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 8 Dec 2007 14:41:29 +0000 (14:41 +0000)

Trivial merge