Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.0

into intel.com:/home/lenb/src/linux-acpi-test-2.6.1

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

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

diff --cc arch/i386/kernel/io_apic.c
Simple merge

diff --cc arch/i386/kernel/mpparse.c
Simple merge

diff --cc arch/i386/kernel/setup.c
Simple merge

diff --cc arch/x86_64/kernel/io_apic.c
Simple merge

diff --cc arch/x86_64/kernel/mpparse.c
Simple merge

diff --cc arch/x86_64/kernel/setup.c
Simple merge

diff --cc include/asm-x86_64/acpi.h
Simple merge