Pull fluff into release branch

Conflicts:

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

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

diff --cc arch/i386/kernel/acpi/boot.c
Simple merge

diff --cc drivers/acpi/asus_acpi.c
Simple merge

diff --cc drivers/acpi/bay.c
Simple merge

diff --cc drivers/acpi/ec.c
Simple merge

diff --cc drivers/acpi/i2c_ec.c
Simple merge

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc drivers/acpi/processor_core.c
Simple merge

diff --cc drivers/acpi/processor_idle.c
Simple merge

diff --cc drivers/acpi/tables.c
Simple merge

diff --cc drivers/acpi/thermal.c
Simple merge