linux-next: manual merge of the acpi tree with the pm tree

[Stephen Rothwell]

Hi Len,

Today's linux-next merge of the acpi tree got a conflict in
arch/x86/kernel/process.c between commit 43720bd60143 ("PM / tracing:
remove deprecated power trace API") from the pm tree and commit
69fb3676df33 ("x86 idle: remove mwait_idle() and "idle=mwait" cmdline
param") from the acpi tree.

I fixed it up (the latter removed the function modified by the former, so
I did that) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature