]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-sleep-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 26 Oct 2012 10:29:46 +0000 (12:29 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 26 Oct 2012 10:29:46 +0000 (12:29 +0200)
* pm-sleep-next:
  driver core / PM: move the calling to device_pm_remove behind the calling to bus_remove_device
  PM / Hibernate: use rb_entry
  PM / sysfs: replace strict_str* with kstrto*

1  2 
kernel/power/qos.c

Simple merge