Merge branch 'u300' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 Sep 2009 15:03:13 +0000 (16:03 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 Sep 2009 15:03:13 +0000 (16:03 +0100)

Trivial merge