diff options
author | 2013-10-16 17:04:41 +0200 | |
---|---|---|
committer | 2013-10-16 17:04:41 +0200 | |
commit | c0ad8568c81979be9c115d22ff1c3580f5ecd0bb (patch) | |
tree | da78df8d5120d3eefd1d5ede2f75db8758969035 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | ACPI: improve acpi_extract_package() utility (diff) | |
parent | ACPI / AC: Remove AC's proc directory. (diff) | |
download | linux-dev-c0ad8568c81979be9c115d22ff1c3580f5ecd0bb.tar.xz linux-dev-c0ad8568c81979be9c115d22ff1c3580f5ecd0bb.zip |
Merge branch 'acpi-conversion' into acpi-assorted
The following commits depend on the 'acpi-conversion' material.
Conflicts:
drivers/acpi/acpi_platform.c
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions