Re: linux-next: Tree for July 20

[Stephen Rothwell]

Hi Mark,

On Wed, 20 Jul 2011 14:02:21 +0100 Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> wrote:
>
> 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.

It was just a simple conflict against the spi tree in
drivers/spi/Makefile that I probably didn't even report.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature