Commit 1b5feb4c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents bb9055b2 3d9b9350

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -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