Merge branch 'pm-cpuidle'
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 18 Jul 2012 22:02:53 +0000 (00:02 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 18 Jul 2012 22:02:53 +0000 (00:02 +0200)

Trivial merge