]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'linus' into test
authorLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:57:26 +0000 (23:57 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 04:11:07 +0000 (00:11 -0400)
commit057316cc6a5b521b332a1d7ccc871cd60c904c74
tree4333e608da237c73ff69b10878025cca96dcb4c8
parent3e2dab9a1c2deb03c311eb3f83466009147ed4d3
parent2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4
Merge branch 'linus' into test

Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c

Signed-off-by: Len Brown <len.brown@intel.com>
30 files changed:
Documentation/kernel-parameters.txt
MAINTAINERS
arch/x86/Kconfig
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/x86/kernel/cpu/cpufreq/powernow-k8.c
arch/x86/kernel/process_64.c
drivers/Makefile
drivers/acpi/Kconfig
drivers/acpi/battery.c
drivers/acpi/sbs.c
drivers/acpi/system.c
drivers/acpi/toshiba_acpi.c
drivers/dma/ioat_dma.c
drivers/misc/Kconfig
drivers/pnp/Makefile
drivers/pnp/base.h
drivers/pnp/core.c
drivers/pnp/driver.c
drivers/pnp/isapnp/core.c
drivers/pnp/pnpacpi/core.c
drivers/pnp/pnpbios/core.c
drivers/pnp/quirks.c
drivers/pnp/resource.c
include/acpi/acmacros.h
include/asm-x86/idle.h
include/linux/kernel.h
include/linux/pci_ids.h
include/linux/pnp.h