Hi all,
Today's linux-next merge of the mvebu tree got a conflict in:
arch/arm/mach-mvebu/pmsu.c
between commit:
9d2ea95a599a ("ARM: mvebu: add broken-idle option")
from the arm-soc tree and commit:
da6ee32a42c0 ("ARM: mvebu: add broken-idle option")
from the mvebu tree.
I fixed it up (looks like 2 version of the same thing (though different)
so I just used the version from the arm-doc tree) and can carry the fix
as necessary (no action is required).
--
Cheers,
Stephen Rothwell [email protected]
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
