Merge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm' into pxa
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 10 Jul 2008 18:50:38 +0000 (19:50 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 10 Jul 2008 18:50:38 +0000 (19:50 +0100)

Trivial merge