Pull novell-bugzilla-156426 into release branch

Conflicts:

	arch/i386/kernel/acpi/boot.c