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

From: Stephen Rothwell
Date: Sun Feb 10 2013 - 20:59:27 EST

Hi Len,

Today's linux-next merge of the acpi tree got a conflict in
drivers/acpi/processor_idle.c between commit 4f8429166818 ("ACPICA:
Cleanup PM_TIMER_FREQUENCY definition") from the pm tree and commit
41cdb0efc42e ("ACPI / idle: remove unused definition") from the acpi tree.

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

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature