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: Fix setting of oprofile cpu type
  powerpc: Update MPC5xxx and Xilinx Virtex maintainer entries
  powerpc adjust oprofile_cpu_type version 3

diff --combined MAINTAINERS
index 9de961b,30cc6af..2b349ba
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3434,11 -3434,10 +3434,10 @@@ L:   linuxppc-dev@ozlabs.or
  S:    Maintained
  
  LINUX FOR POWERPC EMBEDDED MPC5XXX
- P:    Sylvain Munaut
- M:    tnt@246tNt.com
  P:    Grant Likely
  M:    grant.likely@secretlab.ca
  L:    linuxppc-dev@ozlabs.org
+ T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
  
  LINUX FOR POWERPC EMBEDDED PPC4XX
@@@ -3456,6 -3455,7 +3455,7 @@@ P:      Grant Likel
  M:    grant.likely@secretlab.ca
  W:    http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
  L:    linuxppc-dev@ozlabs.org
+ T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
  
  LINUX FOR POWERPC EMBEDDED PPC8XX
@@@ -4189,7 -4189,7 +4189,7 @@@ P:      Joel Becke
  M:    joel.becker@oracle.com
  L:    ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
  W:    http://oss.oracle.com/projects/ocfs2/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git
  S:    Supported
  F:    Documentation/filesystems/ocfs2.txt
  F:    Documentation/filesystems/dlmfs.txt
@@@ -4521,19 -4521,6 +4521,19 @@@ M:    jim@jtan.co
  L:    cbe-oss-dev@ozlabs.org
  S:    Maintained
  
 +PTRACE SUPPORT
 +P:    Roland McGrath
 +M:    roland@redhat.com
 +P:    Oleg Nesterov
 +M:    oleg@redhat.com
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    include/asm-generic/syscall.h
 +F:    include/linux/ptrace.h
 +F:    include/linux/regset.h
 +F:    include/linux/tracehook.h
 +F:    kernel/ptrace.c
 +
  PVRUSB2 VIDEO4LINUX DRIVER
  P:    Mike Isely
  M:    isely@pobox.com
@@@ -4679,13 -4666,13 +4679,13 @@@ F:   kernel/rcutorture.
  
  RDC R-321X SoC
  P:    Florian Fainelli
 -M:    florian.fainelli@telecomint.eu
 +M:    florian@openwrt.org
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
  RDC R6040 FAST ETHERNET DRIVER
  P:    Florian Fainelli
 -M:    florian.fainelli@telecomint.eu
 +M:    florian@openwrt.org
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/r6040.c