Merge branches 'pxa' and 'orion-fixes1'
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 29 Apr 2008 20:31:06 +0000 (21:31 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 29 Apr 2008 20:31:06 +0000 (21:31 +0100)

Trivial merge