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

[Stephen Rothwell]

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                    s...@canb.auug.org.au

pgpfUgfm4hBvx.pgp
Description: OpenPGP digital signature