Messages in this thread | | | Date | Mon, 11 Feb 2013 12:58:56 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the acpi tree with the pm tree |
| |
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).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |