Merge ep93xx branch
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 24 Jun 2006 21:21:35 +0000 (22:21 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 24 Jun 2006 21:21:35 +0000 (22:21 +0100)

Trivial merge