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

Next message: Andreas Mohr: "Re: [REGRESSION] [nailed] USB boot failure: USB: EHCI: make ehci-pcia separate driver"
Previous message: Michael Tokarev: "Re: [PATCH linux-next] autofs4: autofs4_catatonic_mode(): removeredundant null check on kfree()"
In reply to: Grant Likely: "Re: linux-next: manual merge of the samsung tree with the arm-soc tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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: pgp00000.pgp
Description: PGP signature

Next message: Andreas Mohr: "Re: [REGRESSION] [nailed] USB boot failure: USB: EHCI: make ehci-pcia separate driver"
Previous message: Michael Tokarev: "Re: [PATCH linux-next] autofs4: autofs4_catatonic_mode(): removeredundant null check on kfree()"
In reply to: Grant Likely: "Re: linux-next: manual merge of the samsung tree with the arm-soc tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]