diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 17:00:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 17:00:25 -0400 |
commit | 1b5feb4c1f5bfcb6834b8d382d87eb4ffc99a296 (patch) | |
tree | 801c49a26872ba632c20e9378f2ac685741148fb | |
parent | bb9055b2744ada735a2fe555c4196ad39a83ef2a (diff) | |
parent | 3d9b935020cc5e44f4bfb3b2ce62eb9aac777381 (diff) |
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-- | MAINTAINERS | 4 |
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 | |||
7140 | F: include/uapi/linux/phantom.h | 7140 | F: include/uapi/linux/phantom.h |
7141 | 7141 | ||
7142 | SERIAL ATA (SATA) SUBSYSTEM | 7142 | SERIAL ATA (SATA) SUBSYSTEM |
7143 | M: Jeff Garzik <jgarzik@pobox.com> | 7143 | M: Tejun Heo <tj@kernel.org> |
7144 | L: linux-ide@vger.kernel.org | 7144 | L: linux-ide@vger.kernel.org |
7145 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git | 7145 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git |
7146 | S: Supported | 7146 | S: Supported |
7147 | F: drivers/ata/ | 7147 | F: drivers/ata/ |
7148 | F: include/linux/ata.h | 7148 | F: include/linux/ata.h |