Subject: linux-next: manual merge of the libata tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 31 Dec 2015 12:29:15 +1100

Hi Tejun,

Today's linux-next merge of the libata tree got conflicts all over teh
place due to commit:

  53fab927a8fc ("ata: ahci_brcmstb: add support for MIPS-based platforms")

from the libata tree which seem to contain most (if not all) of Linus'
tree :-(.

I have used the version of the libata tree from next-20151223 for today.

-- 
Cheers,
Stephen Rothwell                    [email-masked]