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>

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
index f9f6d4b,5c3f79c..57ed36d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3153,11 -3173,15 +3179,20 @@@ M:   olof@lixom.ne
  L:    i2c@lm-sensors.org
  S:    Maintained
  
 +PANASONIC LAPTOP ACPI EXTRAS DRIVER
 +P:    Harald Welte
 +M:    laforge@gnumonks.org
 +S:    Maintained
 +
+ PANASONIC MN10300/AM33 PORT
+ P:    David Howells
+ M:    dhowells@redhat.com
+ P:    Koichi Yasutake
+ M:    yasutake.koichi@jp.panasonic.com
+ L:    linux-am33-list@redhat.com (moderated for non-subscribers)
+ W:    ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
+ S:    Maintained
+ 
  PARALLEL PORT SUPPORT
  L:    linux-parport@lists.infradead.org (subscribers-only)
  S:    Orphan

diff --cc arch/x86/Kconfig
Simple merge

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

diff --cc arch/x86/kernel/acpi/sleep.c
index 55d10cb,c44cd6d..806b4e9
--- 1/arch/x86/kernel/acpi/sleep.c
--- 2/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@@ -97,7 -98,9 +98,9 @@@ int acpi_save_state_mem(void
  #else /* CONFIG_64BIT */
        header->trampoline_segment = setup_trampoline() >> 4;
  #ifdef CONFIG_SMP
 -      stack_start.sp = temp_stack + 4096;
 +      stack_start.sp = temp_stack + sizeof(temp_stack);
+       early_gdt_descr.address =
+                       (unsigned long)get_cpu_gdt_table(smp_processor_id());
  #endif
        initial_code = (unsigned long)wakeup_long64;
        saved_magic = 0x123456789abcdef0;

diff --cc arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
Simple merge

diff --cc arch/x86/kernel/cpu/cpufreq/powernow-k8.c
Simple merge

diff --cc arch/x86/kernel/process_64.c
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/acpi/Kconfig
Simple merge

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

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

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

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

diff --cc drivers/dma/ioat_dma.c
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/pnp/Makefile
index a381a92,e83f34f..8de3775
--- 1/drivers/pnp/Makefile
--- 2/drivers/pnp/Makefile
+++ b/drivers/pnp/Makefile
@@@ -7,3 -7,10 +7,6 @@@ obj-y           := core.o card.o driver.o resour
  obj-$(CONFIG_PNPACPI)         += pnpacpi/
  obj-$(CONFIG_PNPBIOS)         += pnpbios/
  obj-$(CONFIG_ISAPNP)          += isapnp/
 -
 -ifeq ($(CONFIG_PNP_DEBUG),y)
 -EXTRA_CFLAGS += -DDEBUG
 -endif
+ 
+ # pnp_system_init goes after pnpacpi/pnpbios init
+ obj-y                         += system.o

diff --cc drivers/pnp/base.h
Simple merge

diff --cc drivers/pnp/core.c
Simple merge

diff --cc drivers/pnp/driver.c
Simple merge

diff --cc drivers/pnp/isapnp/core.c
Simple merge

diff --cc drivers/pnp/pnpacpi/core.c
Simple merge

diff --cc drivers/pnp/pnpbios/core.c
Simple merge

diff --cc drivers/pnp/quirks.c
Simple merge

diff --cc drivers/pnp/resource.c
Simple merge

diff --cc include/acpi/acmacros.h
Simple merge

diff --cc include/asm-x86/idle.h
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc include/linux/pnp.h
Simple merge