Merge branch 'misc-2.6.33' into release
authorLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 19:22:32 +0000 (14:22 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 19:22:32 +0000 (14:22 -0500)
commitaa96ce0af8385415a3450bc13e6254a4d6b4a888
tree5d255bc416d469b4d2110910586c43fc6474d51e
parent2900681b25d5a1a1a7b39ab66da3b8c6b1b0b7ad
parentbf8b4542f92c4d8222941b1cab055fa350ab2fb4
Merge branch 'misc-2.6.33' into release
drivers/acpi/numa.c
drivers/acpi/processor_core.c
drivers/platform/x86/acerhdf.c
drivers/thermal/thermal_sys.c
include/linux/acpi.h