]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ce4eac ca499fc de03bee 51468a9)
Merge branches 'acpi-hotplug', 'acpi-sysfs' and 'acpi-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 25 Nov 2013 21:30:30 +0000 (22:30 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 25 Nov 2013 21:30:30 +0000 (22:30 +0100)
* acpi-hotplug:
  ACPI / hotplug: Fix conflicted PCI bridge notify handlers

* acpi-sysfs:
  ACPI / sysfs: Fix incorrect ACPI tables walk in acpi_tables_sysfs_init()
  ACPI / sysfs: Set file size for each exposed ACPI table

* acpi-sleep:
  ACPI / sleep: clean up compiler warning about uninitialized field

1  2  3  4 
drivers/acpi/pci_root.c patch | diff1 | diff2 | diff3 | diff4 | blob | history
drivers/acpi/scan.c patch | diff1 | diff2 | diff3 | diff4 | blob | history
include/acpi/acpi_bus.h patch | diff1 | diff2 | diff3 | diff4 | blob | history

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