diff options
author | 2013-01-26 17:35:05 -0700 | |
---|---|---|
committer | 2013-01-26 17:35:05 -0700 | |
commit | fb455792d91469fe556b68f1baa9ff5493432be8 (patch) | |
tree | 12abb06786d7e09a3d43fc3d852b9848f3805060 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branch 'pci/yijing-ari' into next (diff) | |
parent | Merge branch 'acpi-scan' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into pci/acpi-scan2 (diff) | |
download | linux-dev-fb455792d91469fe556b68f1baa9ff5493432be8.tar.xz linux-dev-fb455792d91469fe556b68f1baa9ff5493432be8.zip |
Merge branch 'pci/acpi-scan2' into next
* pci/acpi-scan2:
ACPI / scan: Drop acpi_bus_add() and use acpi_bus_scan() instead
ACPI: update ej_event interface to take acpi_device
ACPI / scan: Add second pass to acpi_bus_trim()
ACPI / scan: Change the implementation of acpi_bus_trim()
ACPI / scan: Drop the second argument of acpi_bus_trim()
ACPI / scan: Drop the second argument of acpi_device_unregister()
ACPI: Remove the ops field from struct acpi_device
ACPI: remove unused acpi_op_bind and acpi_op_unbind
ACPI / scan: Fix check of device_attach() return value.
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions