Merge branch 'acpi-modules'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 17 Jan 2014 00:59:38 +0000 (01:59 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 17 Jan 2014 00:59:38 +0000 (01:59 +0100)
commitbc411b8a643825b634916f9ba167546a88a0ac28
tree9243b5c8139391e003e31bea845a59975aeced3e
parent8341ecc9f4eb7513951bd1986d78185a11ac6d4e
parentb9f73067f32531db608e469a9ad20ce631e34550
Merge branch 'acpi-modules'

* acpi-modules:
  platform: introduce OF style 'modalias' support for platform bus
  ACPI: fix module autoloading for ACPI enumerated devices
  ACPI: add module autoloading support for ACPI enumerated devices
  ACPI: fix create_modalias() return value handling
drivers/acpi/scan.c
include/linux/acpi.h