]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'linus' into release
authorLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 06:14:15 +0000 (02:14 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 06:14:15 +0000 (02:14 -0400)
commit478c6a43fcbc6c11609f8cee7c7b57223907754f
treea7f7952099da60d33032aed6de9c0c56c9f8779e
parent8a3f257c704e02aee9869decd069a806b45be3f1
parent6bb597507f9839b13498781e481f5458aea33620
Merge branch 'linus' into release

Conflicts:
arch/x86/kernel/cpu/cpufreq/longhaul.c

Signed-off-by: Len Brown <len.brown@intel.com>
26 files changed:
Documentation/kernel-parameters.txt
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/x86/kernel/cpu/cpufreq/longhaul.c
arch/x86/mm/srat_64.c
drivers/acpi/acpica/tbxface.c
drivers/acpi/battery.c
drivers/acpi/dock.c
drivers/acpi/fan.c
drivers/acpi/osl.c
drivers/acpi/processor_core.c
drivers/acpi/processor_perflib.c
drivers/acpi/sbs.c
drivers/acpi/tables.c
drivers/acpi/thermal.c
drivers/acpi/video.c
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/pci/pci-acpi.c
drivers/platform/x86/sony-laptop.c
drivers/platform/x86/thinkpad_acpi.c
include/acpi/acpiosxf.h
include/acpi/acpixf.h
include/linux/acpi.h