| commit | 434a438af20865cd41ab08c07281b72637460e41 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Mon Nov 25 22:30:30 2013 +0100 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Mon Nov 25 22:30:30 2013 +0100 |
| tree | a097c10f49489a593296a13a983043d723c73f5a | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae [diff] | |
| parent | ca499fc87ed945094d952da0eb7eea7dbeb1feec [diff] | |
| parent | de03beedb43fa1fd26792a4e502eeacbf5a6bade [diff] | |
| parent | 51468a9d3a80249a218a854100c6d5d0eb8b781e [diff] |
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