Merge branch 'misc-2.6.33' into release

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

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

diff --cc drivers/platform/x86/acerhdf.c
Simple merge

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

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