]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'pm-sleep-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 24 Oct 2012 20:18:16 +0000 (22:18 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 24 Oct 2012 20:18:16 +0000 (22:18 +0200)
commita3fc24c49d9dabf1d8f9ad2780e0dec4a4daeadf
tree71e07494bfa000825f5de46ea681cd15909bc822
parente957766c7c8212020f134d09c60ea4691b4574fa
parentc3148fdcb239b101acdf2afc40926cca99945843
Merge branch 'pm-sleep-next' into linux-next

* pm-sleep-next:
  PM / Hibernate: use rb_entry
  PM / sysfs: replace strict_str* with kstrto*
kernel/power/qos.c