Pull fluff into release branch
Len Brown [Sat, 17 Feb 2007 03:10:32 +0000 (22:10 -0500)]
Conflicts:

arch/x86_64/pci/mmconfig.c
drivers/acpi/bay.c

Signed-off-by: Len Brown <len.brown@intel.com>

1  2 
arch/i386/kernel/acpi/boot.c
drivers/acpi/asus_acpi.c
drivers/acpi/bay.c
drivers/acpi/ec.c
drivers/acpi/i2c_ec.c
drivers/acpi/osl.c
drivers/acpi/processor_core.c
drivers/acpi/processor_idle.c
drivers/acpi/tables.c
drivers/acpi/thermal.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge