linux-next: missing merge fix patch for the merge of the xen-tip tree with the arm-soc tree

[Linus Torvalds]

On Mon, Dec 22, 2014 at 6:26 PM, Stephen Rothwell <sfr at canb.auug.org.au> wrote:
> Hi Linus,
>
> I have been carrying this merge fix patch for some time that is now
> needed in your tree:

No, it's not. Look more closely.

My merge put the

        dev->archdata.dma_coherent = coherent;

line at the top of the function, like the way it was in the original commit.

                            Linus