8fa79e08f5
Conflicts: include/acpi/processor.h Signed-off-by: Len Brown <len.brown@intel.com>
Conflicts: include/acpi/processor.h Signed-off-by: Len Brown <len.brown@intel.com>