linux-next: manual merge of the pm tree with the arm-soc tree

[Stephen Rothwell]

Hi Rafael,

Today's linux-next merge of the pm tree got a conflict in
arch/arm/mach-shmobile/board-ape6evm-reference.c between commit
664b4c172209 ("ARM: shmobile: ape6evm: Remove duplicate CPUFreq bits")
from the arm-soc tree and commit 978027e170fb ("cpufreq: cpu0: rename
driver and internals to 'cpufreq_dt'") from the pm tree.

I fixed it up (the former removed the line updated by the latter) and
can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: signature.asc
Description: PGP signature