public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: Tree for July 20
Date: Wed, 20 Jul 2011 14:02:21 +0100	[thread overview]
Message-ID: <20110720130220.GA2406@sirena.org.uk> (raw)
In-Reply-To: <20110720180041.5774ca335e6697c17374dca5@canb.auug.org.au>

On Wed, Jul 20, 2011 at 06:00:41PM +1000, Stephen Rothwell wrote:

> The regmap tree lost its conflict.

What was the conflict, OOI?  I didn't notice anything.

  reply	other threads:[~2011-07-20 13:02 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-20  8:00 linux-next: Tree for July 20 Stephen Rothwell
2011-07-20 13:02 ` Mark Brown [this message]
2011-07-20 13:48   ` Stephen Rothwell
2011-07-20 16:19 ` linux-next: Tree for July 20 (qlcnic) Randy Dunlap
2011-07-20 18:10   ` Anirban Chakraborty
2011-07-20 19:43     ` [PATCH] net: vlan: fix compile breakage from 69ecca8 David Lamparter
2011-07-20 21:06       ` Randy Dunlap
2011-07-20 16:36 ` linux-next: Tree for July 20 (acpi/apei/ghes) Randy Dunlap
2011-07-20 16:38   ` Randy Dunlap
2011-07-20 22:06     ` Sedat Dilek
2011-08-02 22:05     ` Len Brown
  -- strict thread matches above, loose matches on Subject: below --
2012-07-20  5:13 linux-next: Tree for July 20 Stephen Rothwell
2010-07-20  6:12 Stephen Rothwell
2009-07-20  6:33 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110720130220.GA2406@sirena.org.uk \
    --to=broonie@opensource.wolfsonmicro.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox