linux-next: manual merge of the arm-soc tree with the tree
sfr at canb.auug.org.au
Sun Apr 6 17:21:02 PDT 2014
Today's linux-next merge of the arm-soc tree got conflicts in
drivers/watchdog/Kconfig and sound/soc/kirkwood/Kconfig between various
merge commits from Linus' tree and various merge commits from the arm-soc
I used the versions from Linus' tree.
Stephen Rothwell sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 836 bytes
Desc: not available
More information about the linux-arm-kernel