linux-next: manual merge of the samsung tree with the arm-soc tree

Stephen Rothwell sfr at canb.auug.org.au
Thu Jan 10 23:32:06 EST 2013


Hi Kukjin,

Today's linux-next merge of the samsung tree got conflicts in
many files with the arm-soc tree.

I just dropped the samsung tree for today.  Please have a look and try to
fix this mess up, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130111/e1281572/attachment.sig>


More information about the linux-arm-kernel mailing list