diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 13:32:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 13:32:23 +1100 |
| commit | 509a2a65821b2dcc67030aa12792c88c45174d1a (patch) | |
| tree | 0612889cfa1514e03630069fbbad96d5beee7f18 /MAINTAINERS | |
| parent | 5220c87d9995479df9aded33841d9d9bac523ece (diff) | |
| parent | 00fa2b191b4bd74e9d22ac177e3d9e8ecd3582d3 (diff) | |
Merge remote-tracking branch 'scsi/master'
Conflicts:
drivers/scsi/libsas/sas_ata.c
drivers/scsi/libsas/sas_scsi_host.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 80d953200a2d..0bd7898c00f6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5344,8 +5344,7 @@ S: Supported F: drivers/s390/crypto/ S390 ZFCP DRIVER -M: Christof Schmitt <christof.schmitt@de.ibm.com> -M: Swen Schillig <swen@vnet.ibm.com> +M: Steffen Maier <maier@linux.vnet.ibm.com> M: linux390@de.ibm.com L: linux-s390@vger.kernel.org W: http://www.ibm.com/developerworks/linux/linux390/ |