Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
arch/arm/mach-kirkwood/pm.c between commit ba364fc752da ("ARM:
Kirkwood: Remove mach-kirkwood") from Linus' tree and commit
bb3274b6442d ("PM / sleep: Rename symbols, functions and variables
related to sleep") from the pm tree.
I fixed it up (I removed the file) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
signature.asc
Description: PGP signature
