diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-01 07:53:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-01 07:53:19 -0400 |
| commit | b3b2b6351a3f3342e6669b5c2defc85f6af75ee3 (patch) | |
| tree | 9b47ae7b0111ab024d719214d2745b128db48beb /MAINTAINERS | |
| parent | 90ae83f7fc32733e5829d806306c0c590f1a383f (diff) | |
| parent | 395bc5121828e570bd4bb6455c82b80e2f2b05b4 (diff) | |
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris:
CRIS: Add paths for CRISv10 serial driver
CRIS: Fix RS485 delay handling.
Add missing "struct" to in sizeof.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cb8b58020352..0094224ca79b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1757,6 +1757,7 @@ L: linux-cris-kernel@axis.com | |||
| 1757 | W: http://developer.axis.com | 1757 | W: http://developer.axis.com |
| 1758 | S: Maintained | 1758 | S: Maintained |
| 1759 | F: arch/cris/ | 1759 | F: arch/cris/ |
| 1760 | F: drivers/serial/crisv10.* | ||
| 1760 | 1761 | ||
| 1761 | CRYPTO API | 1762 | CRYPTO API |
| 1762 | M: Herbert Xu <herbert@gondor.apana.org.au> | 1763 | M: Herbert Xu <herbert@gondor.apana.org.au> |