summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2011-03-20 22:14:04 +0000
committerBen Dooks <ben-linux@fluff.org>2011-03-20 22:14:04 +0000
commite4394d553cec3cbf4d0c602fe39bc88bac43bd27 (patch)
tree89db4a86ac03f74ca6bf0e7b00f8cbf044ff4ccf /MAINTAINERS
parenta952baa034ae7c2e4a66932005cbc7ebbccfe28d (diff)
parent335d7c58fcc1b71387a2c38b610b08bb9d3a6fcc (diff)
downloadlinux-e4394d553cec3cbf4d0c602fe39bc88bac43bd27.tar.gz
linux-e4394d553cec3cbf4d0c602fe39bc88bac43bd27.tar.bz2
linux-e4394d553cec3cbf4d0c602fe39bc88bac43bd27.zip
Merge branch 'for-2639/i2c/i2c-u2c12' into for-linus/2639/i2c-12
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c7a41b1fe453..e12d2217fefa 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2130,6 +2130,12 @@ F: Documentation/serial/digiepca.txt
F: drivers/char/epca*
F: drivers/char/digi*
+DIOLAN U2C-12 I2C DRIVER
+M: Guenter Roeck <guenter.roeck@ericsson.com>
+L: linux-i2c@vger.kernel.org
+S: Maintained
+F: drivers/i2c/busses/i2c-diolan-u2c.c
+
DIRECTORY NOTIFICATION (DNOTIFY)
M: Eric Paris <eparis@parisplace.org>
S: Maintained