| commit | bcef50814c9de8e0672d3e7f9f1abd85e1b95d13 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Tue Mar 18 01:53:28 2014 +0100 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Tue Mar 18 01:53:28 2014 +0100 |
| tree | 751337a429d58b60e03e22d2a30fccd87e1bc02a | |
| parent | d2716578e439a5a693d0817e8ab89802b33b4ded [diff] | |
| parent | 7919010c4224e07b871f3b5513d245cc029fcd67 [diff] |
Merge branch 'acpi-config' into acpica Conflicts: include/acpi/platform/aclinux.h