linux-next: manual merge of the sunxi tree with the arm-soc tree
sfr at canb.auug.org.au
Sun Nov 23 16:16:34 PST 2014
Today's linux-next merge of the sunxi tree got a conflict in
arch/arm/boot/dts/sun6i-a31.dtsi between commit 123ccfcc632a ("Revert
merge of sunxi/dt") from the arm-soc tree and commits from the sunxi
I fixed it up (I just used the version from the sunxi tree) and can
carry the fix as necessary (no action is required).
Stephen Rothwell sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 819 bytes
Desc: OpenPGP digital signature
More information about the linux-arm-kernel