]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'pm-misc' into linux-next
authorRafael J. Wysocki <rjw@sisk.pl>
Fri, 9 Dec 2011 22:38:27 +0000 (23:38 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Fri, 9 Dec 2011 22:38:27 +0000 (23:38 +0100)
commitfc130fb1e8763b6960338d3c0c739c41fe5129c0
treedf31f4e9da92d10db825a1916d4043736b7e5e76
parentaf209e0aea2b1a6216c728decfaa231f587b8c2b
parentd7268a31c8aabc5a29ccc7f76de84383e5f38737
Merge branch 'pm-misc' into linux-next

* pm-misc:
  CPU: Add right qualifiers for alloc_frozen_cpus() and cpu_hotplug_pm_sync_init()
  PM / Usermodehelper: Cleanup remnants of usermodehelper_pm_callback()