]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e957766 c3148fd)
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)
* pm-sleep-next:
  PM / Hibernate: use rb_entry
  PM / sysfs: replace strict_str* with kstrto*

1  2 
kernel/power/qos.c patch | diff1 | diff2 | blob | history

diff --cc kernel/power/qos.c
Simple merge
Linux kernel for KaRo TX COM modules