Merge branch 'acpi-conversion' into acpi-assorted
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 16 Oct 2013 15:04:41 +0000 (17:04 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 16 Oct 2013 15:04:41 +0000 (17:04 +0200)
commitc0ad8568c81979be9c115d22ff1c3580f5ecd0bb
treeda78df8d5120d3eefd1d5ede2f75db8758969035
parente83dda06242073b1c7f9a88f1001e32a4b9fcd1d
parentab0fd674d6cef0904baa511f22613ef6474f8169
Merge branch 'acpi-conversion' into acpi-assorted

The following commits depend on the 'acpi-conversion' material.

Conflicts:
drivers/acpi/acpi_platform.c
drivers/acpi/acpi_platform.c