Merge branch 'pxa' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 15 Oct 2007 17:55:44 +0000 (18:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 15 Oct 2007 17:56:02 +0000 (18:56 +0100)

Trivial merge