Merge branch 'acpi-enumeration'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 7 Dec 2012 22:14:25 +0000 (23:14 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 7 Dec 2012 22:14:25 +0000 (23:14 +0100)
commit583bdc59820692eead7868e816d08bee4c55c1c6
treed9aaa6d76f171aa3f92ec6ae01f0caa29710c623
parent8ab788f00263e886a5ac74b51ee0a226e4363795
parent5e7779f0395833d80d8fa15933737c8dc48759ec
Merge branch 'acpi-enumeration'

* acpi-enumeration:
  ACPI: add Haswell LPSS devices to acpi_platform_device_ids list
  ACPI: add documentation about ACPI 5 enumeration
drivers/acpi/scan.c