Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

diff --combined MAINTAINERS
index 12e2369abe5687e54d5bc8d6782bb703d99e95de,4a1cfca49685c8d230302aa2c20d794ffac75239..8c68092056183b3a4fd5956d199dc0bf2db4873c
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1469,8 -1469,6 +1469,6 @@@ L:      linux-acpi@vger.kernel.or
  S:    Supported
  
  DOCUMENTATION (/Documentation directory)
- P:    Michael Kerrisk
- M:    mtk.manpages@gmail.com
  P:    Randy Dunlap
  M:    rdunlap@xenotime.net
  L:    linux-doc@vger.kernel.org
@@@ -2879,7 -2877,7 +2877,7 @@@ P:      Michael Kerris
  M:    mtk.manpages@gmail.com
  W:    http://www.kernel.org/doc/man-pages
  L:    linux-man@vger.kernel.org
- S:    Supported
+ S:    Maintained
  
  MARVELL LIBERTAS WIRELESS DRIVER
  P:    Dan Williams
@@@ -3352,10 -3350,8 +3350,8 @@@ S:     Maintaine
  PARISC ARCHITECTURE
  P:    Kyle McMartin
  M:    kyle@mcmartin.ca
- P:    Matthew Wilcox
- M:    matthew@wil.cx
- P:    Grant Grundler
- M:    grundler@parisc-linux.org
+ P:    Helge Deller
+ M:    deller@gmx.de
  L:    linux-parisc@vger.kernel.org
  W:    http://www.parisc-linux.org/
  T:    git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
@@@ -4880,8 -4876,7 +4876,8 @@@ S:      Supporte
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
 -P:    Bill O'Donnell
 +P:    Felix Blyakher
 +M:    felixb@sgi.com
  M:    xfs-masters@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs