summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-07 14:00:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-07 14:00:25 -0700
commit1b5feb4c1f5bfcb6834b8d382d87eb4ffc99a296 (patch)
tree801c49a26872ba632c20e9378f2ac685741148fb
parentbb9055b2744ada735a2fe555c4196ad39a83ef2a (diff)
parent3d9b935020cc5e44f4bfb3b2ce62eb9aac777381 (diff)
downloadlinux-stable-1b5feb4c1f5bfcb6834b8d382d87eb4ffc99a296.tar.gz
linux-stable-1b5feb4c1f5bfcb6834b8d382d87eb4ffc99a296.tar.bz2
linux-stable-1b5feb4c1f5bfcb6834b8d382d87eb4ffc99a296.zip
Merge branch 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata maintainership change from Tejun Heo. Tejun is taking over from Jeff, after many many years. Thanks Jeff. * 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: libata: change maintainer
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e1f5fac1838e..eeae5a7bdb88 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7140,9 +7140,9 @@ F: drivers/misc/phantom.c
F: include/uapi/linux/phantom.h
SERIAL ATA (SATA) SUBSYSTEM
-M: Jeff Garzik <jgarzik@pobox.com>
+M: Tejun Heo <tj@kernel.org>
L: linux-ide@vger.kernel.org
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
S: Supported
F: drivers/ata/
F: include/linux/ata.h