linux-next: manual merge of the akpm tree with the memblock tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/mips/Kconfig between commit 9d15ffc824a9 ("mips: Use
HAVE_MEMBLOCK_NODE_MAP") from the memblock tree and commit "MIPS:
randomize PIE load address" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/mips/Kconfig
index 7639c77,c2911b7..0000000

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig

@@@ -25,9 -25,7 +25,10 @@@ config MIP
  	select GENERIC_IRQ_SHOW
  	select HAVE_ARCH_JUMP_LABEL
  	select IRQ_FORCED_THREADING
 +	select HAVE_MEMBLOCK
 +	select HAVE_MEMBLOCK_NODE_MAP
 +	select ARCH_DISCARD_MEMBLOCK
+ 	select ARCH_BINFMT_ELF_RANDOMIZE_PIE
  
  menu "Machine selection"