Subject: linux-next: manual merge of the target-updates tree with the tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 1 Jun 2015 21:22:20 +1000

Hi Nicholas,

Today's linux-next merge of the target-updates tree got so many
conflicts against Linus' tree that I just gave up and dropped it
completely.  Please fix up this mess.

-- 
Cheers,
Stephen Rothwell                    [email-masked]