]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7715f01 2421ad4)
Merge branch 'acpi-fixes-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 17 Oct 2013 13:46:35 +0000 (15:46 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 17 Oct 2013 13:46:35 +0000 (15:46 +0200)
* acpi-fixes-next:
  ACPI / PM: Drop two functions that are not used any more
  ATA / ACPI: remove power dependent device handling

1  2 
drivers/acpi/device_pm.c patch | diff1 | diff2 | blob | history
include/acpi/acpi_bus.h patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/device_pm.c
Simple merge
diff --cc include/acpi/acpi_bus.h
Simple merge
Linux kernel for KaRo TX COM modules