diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-09-04 11:10:27 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-09-04 11:10:27 +0200 |
| commit | d5e8d57f69a9dcc75d27ea5a54587cf03d1f859d (patch) | |
| tree | 250c689d6f23b635c5e24f7fd47544f0ad707e34 | |
| parent | bd804635f451df00cfbc24691ca701e580ecc8a5 (diff) | |
| parent | 87ec8c4ddf88833a62fa126115011302ef865573 (diff) | |
Merge branches 'floppy' and 'pktcdvd' into for-jens
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fdc0119963e7..30c0cd7b2891 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5344,7 +5344,7 @@ S: Maintained F: drivers/pinctrl/spear/ PKTCDVD DRIVER -M: Peter Osterlund <petero2@telia.com> +M: Jiri Kosina <jkosina@suse.cz> S: Maintained F: drivers/block/pktcdvd.c F: include/linux/pktcdvd.h |