Merge branches 'pxa-misc', 'pxa-pwm' and 'pxa-multi' into pxa
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 9 Jul 2008 19:56:05 +0000 (20:56 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 9 Jul 2008 19:56:05 +0000 (20:56 +0100)

Trivial merge