Merge branch 'pxa-fixes'
authorRussell King <[email protected]>
Sat, 8 Dec 2007 14:41:29 +0000 (14:41 +0000)
committerRussell King <[email protected]>
Sat, 8 Dec 2007 14:41:29 +0000 (14:41 +0000)

Trivial merge