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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: linux-next: manual merge of the samsung tree with the arm-soc tree
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 11 Jan 2013 15:32:06 +1100
Cc: linux-next@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, Stephen Warren <swarren@xxxxxxxxxx>, Olof Johansson <olof@xxxxxxxxx>, Arnd Bergmann <arnd@xxxxxxxx>, <linux-arm-kernel@xxxxxxxxxxxxxxxxxxx>

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@xxxxxxxxxxxxxxxx

Attachment: pgpiBHTJU2MXf.pgp
Description: PGP signature

Follow-Ups:
- Re: linux-next: manual merge of the samsung tree with the arm-soc tree
  - From: Stephen Rothwell

Prev by Date: linux-next: manual merge of the samsung tree with the arm-soc tree
Next by Date: linux-next: manual merge of the signal tree with the arm64 tree
Previous by thread: linux-next: manual merge of the samsung tree with the arm-soc tree
Next by thread: Re: linux-next: manual merge of the samsung tree with the arm-soc tree
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel] [Linux USB Development] [Yosemite News] [Linux SCSI]

Powered by Linux