summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-01 07:53:19 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-01 07:53:19 -0400
commitb3b2b6351a3f3342e6669b5c2defc85f6af75ee3 (patch)
tree9b47ae7b0111ab024d719214d2745b128db48beb /MAINTAINERS
parent90ae83f7fc32733e5829d806306c0c590f1a383f (diff)
parent395bc5121828e570bd4bb6455c82b80e2f2b05b4 (diff)
downloadlinux-b3b2b6351a3f3342e6669b5c2defc85f6af75ee3.tar.gz
linux-b3b2b6351a3f3342e6669b5c2defc85f6af75ee3.tar.bz2
linux-b3b2b6351a3f3342e6669b5c2defc85f6af75ee3.zip
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--MAINTAINERS1
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
W: http://developer.axis.com
S: Maintained
F: arch/cris/
+F: drivers/serial/crisv10.*
CRYPTO API
M: Herbert Xu <herbert@gondor.apana.org.au>