]> 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)
commit644765149595957762a6897bdf9eb4211de9b833
treea097c10f49489a593296a13a983043d723c73f5a
parent1386d2af13b0b2ba423da1adf79ceabb7ea834e9
parentf82bceff7947145e84a20dac5d162cf8589ca45e
parent24f8b3c8d8cfa79845c77486f6e8575d5286d729
parentbb0b2e32c50be224fab66d77d48f76cb3aa06268
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