Messages in this thread |  | | Date | Fri, 11 Jan 2013 15:32:06 +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 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@canb.auug.org.au [unhandled content-type:application/pgp-signature] |  |