---

yaml
---
r: 35431
b: refs/heads/master
c: d3660a8
h: refs/heads/master
i:
  35429: a4b55f2
  35427: ab071da
  35423: 0ece247
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a68aa1cc6f3203b8a332683ebde67a00f39eec43
+refs/heads/master: d3660a8cbdfad620af88b85b7bbfff29160f14c2

trunk/Documentation/DocBook/libata.tmpl

@@ -868,18 +868,18 @@ and other resources, etc.
 
   <chapter id="libataExt">
      <title>libata Library</title>
-!Edrivers/ata/libata-core.c
+!Edrivers/scsi/libata-core.c
   </chapter>
 
   <chapter id="libataInt">
      <title>libata Core Internals</title>
-!Idrivers/ata/libata-core.c
+!Idrivers/scsi/libata-core.c
   </chapter>
 
   <chapter id="libataScsiInt">
      <title>libata SCSI translation/emulation</title>
-!Edrivers/ata/libata-scsi.c
-!Idrivers/ata/libata-scsi.c
+!Edrivers/scsi/libata-scsi.c
+!Idrivers/scsi/libata-scsi.c
   </chapter>
 
   <chapter id="ataExceptions">
@@ -1600,12 +1600,12 @@ and other resources, etc.
 
   <chapter id="PiixInt">
      <title>ata_piix Internals</title>
-!Idrivers/ata/ata_piix.c
+!Idrivers/scsi/ata_piix.c
   </chapter>
 
   <chapter id="SILInt">
      <title>sata_sil Internals</title>
-!Idrivers/ata/sata_sil.c
+!Idrivers/scsi/sata_sil.c
   </chapter>
 
   <chapter id="libataThanks">

trunk/MAINTAINERS

@@ -457,9 +457,9 @@ L:	linux-hams@vger.kernel.org
 W:	http://www.baycom.org/~tom/ham/ham.html
 S:	Maintained
 
-BCM43XX WIRELESS DRIVER (SOFTMAC BASED VERSION)
-P:	Larry Finger
-M:	Larry.Finger@lwfinger.net
+BCM43XX WIRELESS DRIVER
+P:	Michael Buesch
+M:	mb@bu3sch.de
 P:	Stefano Brivio
 M:	st3@riseup.net
 W:	http://bcm43xx.berlios.de/
@@ -2389,12 +2389,6 @@ M:	linux-driver@qlogic.com
 L:	linux-scsi@vger.kernel.org
 S:	Supported
 
-QLOGIC QLA3XXX NETWORK DRIVER
-P:	Ron Mercer
-M:	linux-driver@qlogic.com
-L:	netdev@vger.kernel.org
-S:	Supported
-
 QNX4 FILESYSTEM
 P:	Anders Larsen
 M:	al@alarsen.net
@@ -2647,18 +2641,6 @@ P:	Nicolas Pitre
 M:	nico@cam.org
 S:	Maintained
 
-SOFTMAC LAYER (IEEE 802.11)
-P:	Johannes Berg
-M:	johannes@sipsolutions.net
-P:	Joe Jezak
-M:	josejx@gentoo.org
-P:	Daniel Drake
-M:	dsd@gentoo.org
-W:	http://softmac.sipsolutions.net/
-L:	softmac-dev@sipsolutions.net
-L:	netdev@vger.kernel.org
-S:	Maintained
-
 SOFTWARE RAID (Multiple Disks) SUPPORT
 P:	Ingo Molnar
 M:	mingo@redhat.com
@@ -2940,8 +2922,8 @@ W:	http://www.auk.cx/tms380tr/
 S:	Maintained
 
 TULIP NETWORK DRIVER
-P:	Valerie Henson
-M:	val_henson@linux.intel.com
+P:	Jeff Garzik
+M:	jgarzik@pobox.com
 L:	tulip-users@lists.sourceforge.net
 W:	http://sourceforge.net/projects/tulip/
 S:	Maintained
@@ -3392,15 +3374,6 @@ W:	http://www.qsl.net/dl1bke/
 L:	linux-hams@vger.kernel.org
 S:	Maintained
 
-ZD1211RW WIRELESS DRIVER
-P:	Daniel Drake
-M:	dsd@gentoo.org
-P:	Ulrich Kunitz
-M:	kune@deine-taler.de
-W:	http://zd1211.ath.cx/wiki/DriverRewrite
-L:	zd1211-devs@lists.sourceforge.net (subscribers-only)
-S:	Maintained
-
 ZF MACHZ WATCHDOG
 P:	Fernando Fuganti
 M:	fuganti@netbank.com.br

trunk/drivers/Kconfig

@@ -18,8 +18,6 @@ source "drivers/ide/Kconfig"
 
 source "drivers/scsi/Kconfig"
 
-source "drivers/ata/Kconfig"
-
 source "drivers/cdrom/Kconfig"
 
 source "drivers/md/Kconfig"

trunk/drivers/Makefile

@@ -34,7 +34,6 @@ obj-$(CONFIG_PPC_PMAC)		+= macintosh/
 obj-$(CONFIG_IDE)		+= ide/
 obj-$(CONFIG_FC4)		+= fc4/
 obj-$(CONFIG_SCSI)		+= scsi/
-obj-$(CONFIG_ATA)		+= ata/
 obj-$(CONFIG_FUSION)		+= message/
 obj-$(CONFIG_IEEE1394)		+= ieee1394/
 obj-y				+= cdrom/