]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 057b0a7 4cf563c)
Merge branch 'acpi-pm' into pm-sleep
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Jun 2014 22:17:50 +0000 (00:17 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Jun 2014 22:17:50 +0000 (00:17 +0200)
1  2 
kernel/power/suspend.c patch | diff1 | diff2 | blob | history

diff --cc kernel/power/suspend.c
Simple merge
XArray, radix tree and IDR