]> www.infradead.org Git - users/hch/misc.git/commitdiff
projects / users / hch / misc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe82dce 0cadc70)
Merge back earlier 'pm-sleep' material for v3.18.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 29 Sep 2014 13:33:26 +0000 (15:33 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 29 Sep 2014 13:33:26 +0000 (15:33 +0200)
1  2 
Documentation/kernel-parameters.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/kernel-parameters.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.