diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-08-06 13:26:55 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-08-06 13:26:55 -0400 |
| commit | ae87e8b212eda02503418657530a266ecb4a7180 (patch) | |
| tree | 5b91ae2da111567460f0f933a23cc45d2eedc535 /MAINTAINERS | |
| parent | 653f0c8bade3afa975b9223d59323bc09db09cb1 (diff) | |
| parent | bfb5087924921f147d4c5d731cbc8c3a069bed0b (diff) | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.17' into for-next
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1262d3cdaf3d..a262ab2126fe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -7012,6 +7012,7 @@ F: drivers/scsi/pmcraid.* | |||
| 7012 | PMC SIERRA PM8001 DRIVER | 7012 | PMC SIERRA PM8001 DRIVER |
| 7013 | M: xjtuwjp@gmail.com | 7013 | M: xjtuwjp@gmail.com |
| 7014 | M: lindar_liu@usish.com | 7014 | M: lindar_liu@usish.com |
| 7015 | L: pmchba@pmcs.com | ||
| 7015 | L: linux-scsi@vger.kernel.org | 7016 | L: linux-scsi@vger.kernel.org |
| 7016 | S: Supported | 7017 | S: Supported |
| 7017 | F: drivers/scsi/pm8001/ | 7018 | F: drivers/scsi/pm8001/ |