]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-sleep' into linux-next
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 23 Nov 2011 20:17:07 +0000 (21:17 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 23 Nov 2011 20:17:07 +0000 (21:17 +0100)
* pm-sleep:
  PM / Hibernate: Refactor and simplify hibernation_snapshot() code
  PM / Sleep: Simplify device_suspend_noirq()
  PM / Sleep: Remove unnecessary label and jumps to it form PM core code
  PM / Memory-hotplug: Avoid task freezing failures
  PM: Fix indentation and remove extraneous whitespaces in kernel/power/main.c


Trivial merge