]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
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)
* acpi-enumeration:
  ACPI: add Haswell LPSS devices to acpi_platform_device_ids list
  ACPI: add documentation about ACPI 5 enumeration

1  2 
drivers/acpi/scan.c

Simple merge