linux-next: manual merge of the parisc-hd tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the parisc-hd tree got a conflict in
arch/parisc/include/asm/elf.h between commit 9dabf60dc4ab ("parisc: add
flexible mmap memory layout support") from Linus' tree and commit
13de8ec38997 ("parisc: add flexible mmap memory layout support") from the
parisc-hd tree.

It seems that this tree was rebased before being sent to Linus (I
understand why) so I will just drop the whole parisc tree for today.
Please just tidy up.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature