Merge branch 'topic/pm-power-off' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Wed, 5 Nov 2014 10:00:19 +0000 (21:00 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 5 Nov 2014 10:00:19 +0000 (21:00 +1100)

Trivial merge