Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (59 commits)
  ide-floppy: do not complete rq's prematurely
  ide: be able to build pmac driver without IDE built-in
  ide-pmac: IDE cable detection on Apple PowerBook
  ide: inline SELECT_DRIVE()
  ide: turn selectproc() method into dev_select() method (take 5)
  MAINTAINERS: move old ide-{floppy,tape} entries to CREDITS (take 2)
  ide: move data register access out of tf_{read|load}() methods (take 2)
  ide: call {in|out}put_data() methods from tf_{read|load}() methods (take 2)
  ide-io-std: shorten ide_{in|out}put_data()
  ide: rename IDE_TFLAG_IN_[HOB_]FEATURE
  ide: turn set_irq() method into write_devctl() method
  ide: use ATA_HOB
  ide-disk: use ATA_ERR
  ide: add support for CFA specified transfer modes (take 3)
  ide-iops: only clear DMA words on setting DMA mode
  ide: identify data word 53 bit 1 doesn't cover words 62 and 63 (take 3)
  au1xxx-ide: auide_{in|out}sw() should be static
  ide-floppy: use ide_pio_bytes()
  ide-{floppy,tape}: fix padding for PIO transfers
  ide: remove CONFIG_BLK_DEV_IDEDOUBLER config option
  ...

1 files changed, 1 insertions, 14 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index a64f2920a8f..068f5fb9002 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2202,25 +2202,12 @@ L:	linux-ide@vger.kernel.org
 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