]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'acpi/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:22:14 +0000 (10:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:22:14 +0000 (10:22 +1000)
commitf440264d195d55b5a3c77adae8d61ef6dbf3bb78
treec0cf3c438931163b7ad03cd8ff100fff5a63137c
parentdfb551f07f6de23c64e8ee15f66529b553e971e4
parent2eb119f226c0cc93a4bc35db9f526cd9f817d86b
Merge remote-tracking branch 'acpi/next'

Conflicts:
drivers/pci/pci-acpi.c
14 files changed:
MAINTAINERS
drivers/acpi/ac.c
drivers/acpi/battery.c
drivers/acpi/processor_driver.c
drivers/acpi/processor_idle.c
drivers/acpi/scan.c
drivers/acpi/sleep.c
drivers/acpi/thermal.c
drivers/cpuidle/cpuidle.c
drivers/idle/intel_idle.c
drivers/platform/x86/intel_mid_thermal.c
include/acpi/acnames.h
include/acpi/acpi_bus.h
include/linux/cpuidle.h