linux-next: manual merge of the samsung tree with the arm-soc tree
sfr at canb.auug.org.au
Wed Feb 13 02:39:47 EST 2013
Today's linux-next merge of the samsung tree got conflicts in quite a few
files between commits from the arm-soc tree and commits from the samsung
I took Olof's advice and just dropped the samsung tree for today.
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