| commit | 054c1c45395175ad057487d456668b83d51856ec | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Fri May 16 16:33:32 2014 +0200 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Fri May 16 16:33:32 2014 +0200 |
| tree | 084a32b1e5eb05014663a0f767e0b5a1426d8810 | |
| parent | d6d211db37e75de2ddc3a4f979038c40df7cc79c [diff] | |
| parent | 3afcb96fee9ba33ce838f2ceaa248358cffe2f56 [diff] |
Merge branch 'acpi-proc' into acpi-battery