linux-next: manual merge of the acpi tree

Hi Len,

Today's linux-next merge of the acpi tree got a conflict in
arch/x86/kernel/process.c between commit
aa276e1cafb3ce9d01d1e837bcd67e92616013ac ("x86, clockevents: add C1E
aware idle function") from the x86 tree and commits
dbce8340e4549b612ac74fc7175721f9aed67b62 ("ACPI: Create "idle=halt"
bootparam") from the acpi tree.

Just a case of overlapping additions.  I did the obvious fixup and can
carry it.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/