Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/x86/kernel/trampoline.c between commit c9b77ccb52a5 ("x86, realmode:
Move ACPI wakeup to unified realmode code") from the tip tree and commit
"x86: print physical addresses consistently with other parts of kernel"
from the akpm tree.

The former removed (or moved) the code modified by the latter and removed
the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au