Merge branches 'at91', 'imx', 'iop', 'ixp', 'ks8695', 'misc', 'ns9xxx', 'pxa' and...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 22 Jul 2007 16:09:17 +0000 (17:09 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 22 Jul 2007 16:09:17 +0000 (17:09 +0100)

Trivial merge