Messages in this thread | | | Date | Wed, 13 Feb 2013 18:39:47 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the samsung tree with the arm-soc tree |
| |
Hi Kukjin,
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 tree.
I took Olof's advice and just dropped the samsung tree for today.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |