]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit97039b534e74405d63f1d97f6e2cc660aa178091
treea097c10f49489a593296a13a983043d723c73f5a
parent446a01ebfd5c46dcad993153e533f5f1d30e2d44
parent4b0cc26ea2f7c8e812a9931ce6292b34af1a4c7e
parentaaec24bea5cca3e8f7e2f6f4c6c61d3a9c48c395
parentc14fb26aa09b2d66357373b84cfbfa18e6beae15
Merge branches 'acpi-hotplug', 'acpi-sysfs' and 'acpi-sleep'

* 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
drivers/acpi/pci_root.c
drivers/acpi/scan.c
include/acpi/acpi_bus.h