summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-04-28 23:17:36 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-04-28 23:17:36 +0200
commit131b3a8db237dc3dc12b098e1dbf2be3b8de3c27 (patch)
treec4b4885351f09545f196b7b0acbb5806fd83d375 /init
parent5a7ad1146caa895ad718a534399e38bd2ba721b7 (diff)
parentc381fc3a1bbfc9d780048a0b94afd162e4c3815b (diff)
parentf49c3f90a31f6e19ef3343dcc8809dac1019b59e (diff)
parent79f97c3051e16b117b47e0586a368c4f54a82909 (diff)
Merge branches 'acpi-scan', 'acpi-tables' and 'acpi-platform'
* acpi-scan: ACPI / scan: Avoid enumerating devices more than once ACPI / scan: Apply default enumeration to devices with ACPI drivers ACPI / scan: Drop support for force_remove * acpi-tables: ACPI / tables: Drop acpi_parse_entries() which is not used * acpi-platform: ACPI / platform: Update platform device NUMA node based on _PXM method