diff options
| author | Al Stone <ahs3@redhat.com> | 2015-01-22 14:02:23 -0700 |
|---|---|---|
| committer | Al Stone <ahs3@redhat.com> | 2015-01-22 14:02:23 -0700 |
| commit | 38b8c749d534411169b5572eac556d131cf7a906 (patch) | |
| tree | e511d2339a9943f3aa472a29e60a2bd62e2fa9e6 | |
| parent | 9c732196a86c9cef808c151a7e397f734f7d747e (diff) | |
| parent | 5a90b3fb2b85958b3cdba7699e1c60cf1509b706 (diff) | |
Merge branch 'acpi-doc-v0' of ssh://git.linaro.org/leg/acpi/acpi into acpi-doc-v0acpi-doc-v0
Conflicts:
Documentation/arm64/acpi_object_usage.txt
Documentation/arm64/arm-acpi.txt
Documentation/arm64/why_use_acpi.txt
0 files changed, 0 insertions, 0 deletions