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@xxxxxxxxxxxxxxxx
Attachment:
pgpL8atMxFAF_.pgp
Description: PGP signature
