Merge branch 'next-s3c-pm' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 26 Mar 2009 22:44:43 +0000 (22:44 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 26 Mar 2009 22:44:43 +0000 (22:44 +0000)
commitf5f0e17a8475dee913f362510e6a8ab987d27b9f
treeebe44e7774400730f6c15cd5a84187113c274e3d
parent2f3ec501ba1e1a68ab9d413f143bdc8f46417fc1
parentfff94cd9f5527bbba13aa5ea5719d16531ca8e65
Merge branch 'next-s3c-pm' of git://aeryn.fluff.org.uk/bjdooks/linux into devel