diff for duplicates of <20100311105804.GD2585@rakim.wolfsonmicro.main> diff --git a/a/1.txt b/N1/1.txt index ea4311e..4a49282 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ On Thu, Mar 11, 2010 at 04:20:35PM +0800, Eric Miao wrote: > On Wed, Mar 10, 2010 at 10:28 PM, Mark Brown -> > cycle? I can apply the patches on a branch by themselves which can also +> > cycle? ?I can apply the patches on a branch by themselves which can also > > be pulled into the PXA tree if needed. > I'd expect there to be some merge conflicts I need to solve along with diff --git a/a/content_digest b/N1/content_digest index 70f62e5..6fed00f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,16 @@ "ref\0771cded01003100514r70f0f53eydda7b916f92bef64@mail.gmail.com\0" "ref\020100310142832.GB24422@rakim.wolfsonmicro.main\0" "ref\0f17812d71003110020g67bb7fd6tfe1381294b6cfe8f@mail.gmail.com\0" - "From\0Mark Brown <broonie@opensource.wolfsonmicro.com>\0" - "Subject\0Re: [PATCH 2/4] mmp: support ssp in pxa168\0" + "From\0broonie@opensource.wolfsonmicro.com (Mark Brown)\0" + "Subject\0[PATCH 2/4] mmp: support ssp in pxa168\0" "Date\0Thu, 11 Mar 2010 10:58:05 +0000\0" - "To\0Eric Miao <eric.y.miao@gmail.com>\0" - "Cc\0alsa-devel@alsa-project.org" - linux-arm-kernel <linux-arm-kernel@lists.infradead.org> - Haojian Zhuang <haojian.zhuang@gmail.com> - " lrg@slimlogic.co.uk\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thu, Mar 11, 2010 at 04:20:35PM +0800, Eric Miao wrote:\n" "> On Wed, Mar 10, 2010 at 10:28 PM, Mark Brown\n" "\n" - "> > cycle? \302\240I can apply the patches on a branch by themselves which can also\n" + "> > cycle? ?I can apply the patches on a branch by themselves which can also\n" "> > be pulled into the PXA tree if needed.\n" "\n" "> I'd expect there to be some merge conflicts I need to solve along with\n" @@ -38,4 +34,4 @@ "Big thing is that there's most likely going to be at least cosmetic\n" changes to how cards are registered. -8812dc5498b6f3dd697fb71d5efa8435bda8bdde76a7460da629dc7217bd53ff +fc97b35681246de002c87f72c8d1f59cf69d22c1da10e2bc42cf34a2c2c7b15f
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.