From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: Re: linux-next: Tree for July 20
Date: Wed, 20 Jul 2011 14:02:21 +0100
Message-ID: <20110720130220.GA2406@sirena.org.uk>
References: <20110720180041.5774ca335e6697c17374dca5@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from cassiel.sirena.org.uk ([80.68.93.111]:36501 "EHLO
	cassiel.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751302Ab1GTNCX (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Wed, 20 Jul 2011 09:02:23 -0400
Content-Disposition: inline
In-Reply-To: <20110720180041.5774ca335e6697c17374dca5@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>

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.