]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'acpi/test'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:10:48 +0000 (13:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:10:48 +0000 (13:10 +1000)
commit112c6a6e84d9cecc887e0d99170b1d6f5341c971
tree2e99591dffd070e1b70e5b54ae8efec34e7a6e2c
parent457e0db874b200daf3dd515436e45c141a659e6f
parent4f0c129e0629a1c837c7fcdbd53a65afe6bbd60e
Merge remote-tracking branch 'acpi/test'

Conflicts:
arch/ia64/Kconfig
arch/powerpc/Kconfig
arch/x86/Kconfig
lib/Kconfig
lib/Makefile
15 files changed:
Documentation/kernel-parameters.txt
arch/alpha/Kconfig
arch/ia64/Kconfig
arch/m68k/Kconfig
arch/powerpc/Kconfig
arch/sh/Kconfig
arch/x86/Kconfig
drivers/acpi/apei/erst.c
drivers/acpi/battery.c
drivers/acpi/sbs.c
drivers/ata/libata-acpi.c
drivers/cpufreq/acpi-cpufreq.c
include/linux/mm.h
lib/Kconfig
lib/Makefile