Merge branches 'clks' and 'pnx' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 22:10:38 +0000 (22:10 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 22:10:38 +0000 (22:10 +0000)

Trivial merge