summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-30 14:50:44 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-30 14:50:44 -0800
commitaf5fdf80645304e7077ab876a43b325425c7ef70 (patch)
treef832bcdc45c60a7858b64f0a340cd10934c3eb9f /MAINTAINERS
parent07a6d5a49c985ae6111221b93b3a48772cc4b976 (diff)
parent4d29196c535088e807061ce2a0aa526daec2edfb (diff)
downloadop-kernel-dev-af5fdf80645304e7077ab876a43b325425c7ef70.zip
op-kernel-dev-af5fdf80645304e7077ab876a43b325425c7ef70.tar.gz
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: at24: Use timeout also for read i2c: Fix userspace_device list corruption MAINTAINERS: Add missing i2c files i2c/tsl2550: Fix lux value in extended mode
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c385456..16129e6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2562,8 +2562,7 @@ S: Maintained
F: Documentation/i2c/
F: drivers/i2c/
F: include/linux/i2c.h
-F: include/linux/i2c-dev.h
-F: include/linux/i2c-id.h
+F: include/linux/i2c-*.h
I2C-TINY-USB DRIVER
M: Till Harbaum <till@harbaum.org>
OpenPOWER on IntegriCloud