Subject: linux-next: manual merge of the acpi tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 17 Jul 2008 14:05:18 +1000

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 linus' tree and commit
dbce8340e4549b612ac74fc7175721f9aed67b62 ("ACPI: Create "idle=halt"
bootparam") from the acpi tree (which is also in Linus' tree).

Just overlapping additions.  A merge of Linus' tree will make it go away.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/