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)
Conflicts:
include/acpi/processor.h

Signed-off-by: Len Brown <len.brown@intel.com>

Trivial merge