Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

diff --combined MAINTAINERS
index aa257301d86b8bfef5fd2b48c8135addd647e817,ec8433c39deee71023cfd130f739bd62d8e7faff..6d187fb934f3a90c236387b1d4537b0caa99c5c9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -371,10 -371,7 +371,10 @@@ W:       http://atmelwlandriver.sourceforge.n
  S:    Maintained
  
  AUDIT SUBSYSTEM
 -L:    linux-audit@redhat.com (subscribers-only)
 +P:    David Woodhouse
 +M:    dwmw2@infradead.org
 +L:    linux-audit@redhat.com
 +W:    http://people.redhat.com/sgrubb/audit/
  S:    Maintained
  
  AX.25 NETWORK LAYER
@@@ -1419,13 -1416,20 +1419,20 @@@ W:   http://www.penguinppc.org
  L:    linuxppc-embedded@ozlabs.org
  S:    Maintained
  
- LINUX FOR POWERPC EMBEDDED PPC8XX AND BOOT CODE
+ LINUX FOR POWERPC BOOT CODE
  P:    Tom Rini
  M:    trini@kernel.crashing.org
  W:    http://www.penguinppc.org/
  L:    linuxppc-embedded@ozlabs.org
  S:    Maintained
  
+ LINUX FOR POWERPC EMBEDDED PPC8XX
+ P:    Marcelo Tosatti
+ M:    marcelo.tosatti@cyclades.com
+ W:    http://www.penguinppc.org/
+ L:    linuxppc-embedded@ozlabs.org
+ S:    Maintained
+ 
  LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
  P:     Kumar Gala
  M:     kumar.gala@freescale.com