diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 17:50:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 17:50:44 -0500 |
| commit | af5fdf80645304e7077ab876a43b325425c7ef70 (patch) | |
| tree | f832bcdc45c60a7858b64f0a340cd10934c3eb9f /MAINTAINERS | |
| parent | 07a6d5a49c985ae6111221b93b3a48772cc4b976 (diff) | |
| parent | 4d29196c535088e807061ce2a0aa526daec2edfb (diff) | |
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-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c385456caaf..16129e67678 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2562,8 +2562,7 @@ S: Maintained | |||
| 2562 | F: Documentation/i2c/ | 2562 | F: Documentation/i2c/ |
| 2563 | F: drivers/i2c/ | 2563 | F: drivers/i2c/ |
| 2564 | F: include/linux/i2c.h | 2564 | F: include/linux/i2c.h |
| 2565 | F: include/linux/i2c-dev.h | 2565 | F: include/linux/i2c-*.h |
| 2566 | F: include/linux/i2c-id.h | ||
| 2567 | 2566 | ||
| 2568 | I2C-TINY-USB DRIVER | 2567 | I2C-TINY-USB DRIVER |
| 2569 | M: Till Harbaum <till@harbaum.org> | 2568 | M: Till Harbaum <till@harbaum.org> |