Pull bugzilla-5737 into release branch

Conflicts:

	arch/x86_64/kernel/acpi/processor.c