aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-23 10:39:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-23 10:39:00 -0700
commit4843a3baf20059a7ac5b55582672705d9e61e274 (patch)
tree15a4a67b1c929493896d9cfca02ef079f6267e17 /MAINTAINERS
parentcb4cbcf6b3cf79f80c157afdc8dd8221643d8481 (diff)
parente01698aed04811b9a9c4f8d54b73cb182757063d (diff)
downloadkernel_samsung_espresso10-4843a3baf20059a7ac5b55582672705d9e61e274.zip
kernel_samsung_espresso10-4843a3baf20059a7ac5b55582672705d9e61e274.tar.gz
kernel_samsung_espresso10-4843a3baf20059a7ac5b55582672705d9e61e274.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: ide cmd64x: Remove serialize setting. ide: Take over as maintainer.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 02f6f78..5ef3a16 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2824,10 +2824,10 @@ S: Supported
F: drivers/scsi/ips.*
IDE SUBSYSTEM
-P: Bartlomiej Zolnierkiewicz
-M: bzolnier@gmail.com
+P: David S. Miller
+M: davem@davemloft.net
L: linux-ide@vger.kernel.org
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git
S: Maintained
F: Documentation/ide/
F: drivers/ide/