diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 18:15:07 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 18:15:07 +1000 |
| commit | 5e74e559d2b9bad7583529d9836aed242379bf0a (patch) | |
| tree | dc01e627050069d6075e8f413061dacecedef264 /MAINTAINERS | |
| parent | 9f2c26aa090877daf7fdddb1b760af046e38030b (diff) | |
| parent | 9f5b39070c6c1ea062cea18ecd3e767e1dc3671a (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/x86/syscalls/syscall_64.tbl
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2359dce3db90..4633cc2f9bab 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3220,26 +3220,12 @@ T: git git://linuxtv.org/anttip/media_tree.git S: Maintained F: drivers/media/tuners/e4000* -EATA-DMA SCSI DRIVER -M: Michael Neuffer <mike@i-Connect.Net> -L: linux-eata@i-connect.net -L: linux-scsi@vger.kernel.org -S: Maintained -F: drivers/scsi/eata* - EATA ISA/EISA/PCI SCSI DRIVER M: Dario Ballabio <ballabio_dario@emc.com> L: linux-scsi@vger.kernel.org S: Maintained F: drivers/scsi/eata.c -EATA-PIO SCSI DRIVER -M: Michael Neuffer <mike@i-Connect.Net> -L: linux-eata@i-connect.net -L: linux-scsi@vger.kernel.org -S: Maintained -F: drivers/scsi/eata_pio.* - EC100 MEDIA DRIVER M: Antti Palosaari <crope@iki.fi> L: linux-media@vger.kernel.org @@ -4484,10 +4470,7 @@ S: Supported F: drivers/scsi/ibmvscsi/ibmvfc* IBM ServeRAID RAID DRIVER -P: Jack Hammer -M: Dave Jeffery <ipslinux@adaptec.com> -W: http://www.developer.ibm.com/welcome/netfinity/serveraid.html -S: Supported +S: Orphan F: drivers/scsi/ips.* ICH LPC AND GPIO DRIVER @@ -7179,7 +7162,7 @@ F: drivers/ptp/* F: include/linux/ptp_cl* PTRACE SUPPORT -M: Roland McGrath <roland@redhat.com> +M: Roland McGrath <roland@hack.frob.com> M: Oleg Nesterov <oleg@redhat.com> S: Maintained F: include/asm-generic/syscall.h |