linux-next: bad merge in the libata tree

From: Stephen Rothwell
Date: Tue Jun 04 2013 - 20:14:00 EST

Hi Tejun,

The top commit of the libata tree is a merge that leaves some conflict
markers in drivers/ata/sata_rcar.c ...

I will use yesterday's tree for today.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature