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)
commit434a438af20865cd41ab08c07281b72637460e41
treea097c10f49489a593296a13a983043d723c73f5a
parent6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae
parentca499fc87ed945094d952da0eb7eea7dbeb1feec
parentde03beedb43fa1fd26792a4e502eeacbf5a6bade
parent51468a9d3a80249a218a854100c6d5d0eb8b781e
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