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

diff --combined MAINTAINERS
index 07e6fcdcfe6580fcc86fff93a8b99ec5c8184adc,068f5fb900209102a96e99d79a0adcece8238d6c..faf43fc6153f08f1a70a483e4246cf867efdb6a1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -357,6 -357,7 +357,7 @@@ S: Odd Fixes for 2.4; Maintained for 2.
  P:    Ivan Kokshaysky
  M:    ink@jurassic.park.msu.ru
  S:    Maintained for 2.4; PCI support for 2.6.
+ L:    linux-alpha@vger.kernel.org
  
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
  P:    Thomas Dahlmann
@@@ -2201,25 -2202,12 +2202,12 @@@ L:   linux-ide@vger.kernel.or
  T:    quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
  S:    Maintained
  
- IDE/ATAPI CDROM DRIVER
+ IDE/ATAPI DRIVERS
  P:    Borislav Petkov
  M:    petkovbb@gmail.com
  L:    linux-ide@vger.kernel.org
  S:    Maintained
  
- IDE/ATAPI FLOPPY DRIVERS
- P:    Paul Bristow
- M:    Paul Bristow <paul@paulbristow.net>
- W:    http://paulbristow.net/linux/idefloppy.html
- L:    linux-kernel@vger.kernel.org
- S:    Maintained
- 
- IDE/ATAPI TAPE DRIVERS
- P:    Gadi Oxman
- M:    Gadi Oxman <gadio@netvision.net.il>
- L:    linux-kernel@vger.kernel.org
- S:    Maintained
- 
  IDLE-I7300
  P:    Andy Henroid
  M:    andrew.d.henroid@intel.com
@@@ -4972,8 -4960,7 +4960,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