diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-17 12:13:15 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-17 12:13:15 +1100 |
| commit | 932a745a92f4e79d96900314bba4cc68ecd76958 (patch) | |
| tree | fbdcba525c723eda7cc697ec0e2c90b0d38e4567 /MAINTAINERS | |
| parent | f0b64c00714520da94c25e8af78a4fd0ca48f9c4 (diff) | |
| parent | 0c82d3ce2f479c728f99e228d9ae32a9cd853c5a (diff) | |
Merge remote branch 'mtd/master'
Conflicts:
drivers/mtd/nand/sh_flctl.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5f9c3776fec2..709930871672 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4705,6 +4705,12 @@ S: Maintained F: Documentation/rfkill.txt F: net/rfkill/ +RICOH SMARTMEDIA/XD DRIVER +M: Maxim Levitsky <maximlevitsky@gmail.com> +S: Maintained +F: drivers/mtd/nand/r822.c +F: drivers/mtd/nand/r822.h + RISCOM8 DRIVER S: Orphan F: Documentation/serial/riscom8.txt |