Merge branch 'wip-mips-pm' of https://github.com/paulburton/linux into mips-for-linux...
authorRalf Baechle <ralf@linux-mips.org>
Wed, 28 May 2014 17:00:14 +0000 (19:00 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 29 May 2014 13:08:23 +0000 (15:08 +0200)

Trivial merge