]> www.infradead.org Git - users/hch/configfs.git/commitdiff
projects / users / hch / configfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf900af b5d667e)
Merge branch 'acpi-pm' into fixes
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 23 Feb 2013 22:15:43 +0000 (23:15 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 23 Feb 2013 22:15:43 +0000 (23:15 +0100)
* acpi-pm:
  ACPI / PM: Take unusual configurations of power resources into account

1  2 
drivers/acpi/internal.h patch | diff1 | diff2 | blob | history
drivers/acpi/scan.c patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/internal.h
Simple merge
diff --cc drivers/acpi/scan.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.