| commit | c0ad8568c81979be9c115d22ff1c3580f5ecd0bb | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Wed Oct 16 17:04:41 2013 +0200 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Wed Oct 16 17:04:41 2013 +0200 |
| tree | da78df8d5120d3eefd1d5ede2f75db8758969035 | |
| parent | e83dda06242073b1c7f9a88f1001e32a4b9fcd1d [diff] | |
| parent | ab0fd674d6cef0904baa511f22613ef6474f8169 [diff] |
Merge branch 'acpi-conversion' into acpi-assorted The following commits depend on the 'acpi-conversion' material. Conflicts: drivers/acpi/acpi_platform.c