Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Really fix build without CONFIG_PCI
  powerpc: Fix build without CONFIG_PCI
  powerpc/4xx: Fix build of PCI code on 405
  powerpc/pseries: Simplify vpa deregistration functions
  powerpc/pseries: Cleanup VPA registration and deregistration errors
  powerpc/pseries: Fix kexec on recent firmware versions
  MAINTAINERS: change maintainership of mpc5xxx
  powerpc: Make KVM_GUEST default to n
  powerpc/kvm: Fix build errors with older toolchains
  powerpc: Lack of ibm,io-events not that important!
  powerpc: Move kdump default base address to half RMO size on 64bit
  powerpc/perf: Disable pagefaults during callchain stack read
  ppc: Remove duplicate definition of PV_POWER7
  powerpc: pseries: Fix kexec on machines with more than 4TB of RAM
  powerpc: Jump label misalignment causes oops at boot
  powerpc: Clean up some panic messages in prom_init
  powerpc: Fix device tree claim code
  powerpc: Return the_cpu_ spec from identify_cpu
  powerpc: mtspr/mtmsr should take an unsigned long

diff --combined MAINTAINERS
index 51d42fbc8dc40a9f09da5471085a928c244e62ed,2c1bc6ea22ea1f006232ed2406b998b669e294ec..1f8267f1a2abaa9461bf987497dbf3b1a2cc2e1e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2643,8 -2643,9 +2643,8 @@@ S:      Maintaine
  F:    arch/x86/math-emu/
  
  FRAME RELAY DLCI/FRAD (Sangoma drivers too)
 -M:    Mike McLagan <mike.mclagan@linux.org>
  L:    netdev@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    drivers/net/wan/dlci.c
  F:    drivers/net/wan/sdla.c
  
@@@ -3905,9 -3906,9 +3905,9 @@@ F:      arch/powerpc/platforms/powermac
  F:    drivers/macintosh/
  
  LINUX FOR POWERPC EMBEDDED MPC5XXX
- M:    Grant Likely <grant.likely@secretlab.ca>
+ M:    Anatolij Gustschin <agust@denx.de>
  L:    linuxppc-dev@lists.ozlabs.org
- T:    git git://git.secretlab.ca/git/linux-2.6.git
+ T:    git git://git.denx.de/linux-2.6-agust.git
  S:    Maintained
  F:    arch/powerpc/platforms/512x/
  F:    arch/powerpc/platforms/52xx/
@@@ -4414,10 -4415,10 +4414,10 @@@ F:   net/*/netfilter
  F:    net/netfilter/
  
  NETLABEL
 -M:    Paul Moore <paul.moore@hp.com>
 +M:    Paul Moore <paul@paul-moore.com>
  W:    http://netlabel.sf.net
  L:    netdev@vger.kernel.org
 -S:    Supported
 +S:    Maintained
  F:    Documentation/netlabel/
  F:    include/net/netlabel.h
  F:    net/netlabel/
@@@ -4462,6 -4463,7 +4462,6 @@@ F:      include/linux/netdevice.
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <davem@davemloft.net>
  M:    Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
 -M:    "Pekka Savola (ipv6)" <pekkas@netcore.fi>
  M:    James Morris <jmorris@namei.org>
  M:    Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
  M:    Patrick McHardy <kaber@trash.net>
@@@ -4474,7 -4476,7 +4474,7 @@@ F:      include/net/ip
  F:    arch/x86/net/*
  
  NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
 -M:    Paul Moore <paul.moore@hp.com>
 +M:    Paul Moore <paul@paul-moore.com>
  L:    netdev@vger.kernel.org
  S:    Maintained