Merge branch 'linus' into release

Conflicts:
	drivers/acpi/debug.c

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

diff --cc drivers/acpi/Kconfig
Simple merge

diff --cc drivers/acpi/Makefile
Simple merge

diff --cc drivers/acpi/internal.h
Simple merge

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

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