diff options
author | 2013-11-25 22:30:30 +0100 | |
---|---|---|
committer | 2013-11-25 22:30:30 +0100 | |
commit | 434a438af20865cd41ab08c07281b72637460e41 (patch) | |
tree | a097c10f49489a593296a13a983043d723c73f5a /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | Linux 3.13-rc1 (diff) | |
parent | ACPI / hotplug: Fix conflicted PCI bridge notify handlers (diff) | |
parent | ACPI / sysfs: Fix incorrect ACPI tables walk in acpi_tables_sysfs_init() (diff) | |
parent | ACPI / sleep: clean up compiler warning about uninitialized field (diff) | |
download | linux-dev-434a438af20865cd41ab08c07281b72637460e41.tar.xz linux-dev-434a438af20865cd41ab08c07281b72637460e41.zip |
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