]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'ost' into release
authorLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 07:18:36 +0000 (02:18 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 07:18:36 +0000 (02:18 -0500)
commit8fa79e08f50f4ec1fd8903eca6fd6f36c36dd4c4
tree76cd9d4492d7fe4e2a90dbbc43127ca80ad93288
parent7458bbd044f0e799ad27c3fc71e1115ac30a9c25
parentd81c45e1c9369855901420f79114852eba2ea16a
Merge branch 'ost' into release

Conflicts:
include/acpi/processor.h

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/processor_core.c
drivers/acpi/processor_perflib.c
include/acpi/processor.h