]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-misc' into linux-next
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 1 Dec 2011 20:50:37 +0000 (21:50 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Thu, 1 Dec 2011 20:50:37 +0000 (21:50 +0100)
* pm-misc:
  CPU: Add right qualifiers for alloc_frozen_cpus() and cpu_hotplug_pm_sync_init()
  PM / Usermodehelper: Cleanup remnants of usermodehelper_pm_callback()


Trivial merge