]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit76a0fd5fe956e62132c8d72ecf28ffa0153398ff
tree3bfc91336f7310e3b70058db85e28833067bc661
parent18ffcb68492bcfc34f969711e2b6c524ce716b70
parent04a130a9c43166a037664ca61b2c6ea0930f0e26
Merge branch 'acpi-pm' into fixes

* acpi-pm:
  ACPI / PM: Take unusual configurations of power resources into account
drivers/acpi/internal.h
drivers/acpi/scan.c