Merge branch 'pm' into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 22 Sep 2011 21:39:23 +0000 (22:39 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 22 Sep 2011 21:39:23 +0000 (22:39 +0100)

Trivial merge