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

From: Stephen Rothwell
Date: Wed Feb 13 2013 - 02:39:58 EST

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

I took Olof's advice and just dropped the samsung tree for today.

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature