diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-22 10:05:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-22 10:05:27 -0700 |
| commit | 75ea6358bc7d97630a8edc2b89c930de118cf7eb (patch) | |
| tree | e77a60e46844adf71758bad41d77d40658acd7eb /MAINTAINERS | |
| parent | 14577beb8293c187a12d2e78ac6250d5dcec2190 (diff) | |
| parent | 97491ba3f64c2137101efdfe7593305d692d7d63 (diff) | |
| download | linux-3.10-75ea6358bc7d97630a8edc2b89c930de118cf7eb.tar.gz linux-3.10-75ea6358bc7d97630a8edc2b89c930de118cf7eb.tar.bz2 linux-3.10-75ea6358bc7d97630a8edc2b89c930de118cf7eb.zip | |
Merge branch 'for-linus/2639/i2c-2' of git://git.fluff.org/bjdooks/linux
* 'for-linus/2639/i2c-2' of git://git.fluff.org/bjdooks/linux:
i2c-pxa2xx: Don't clear isr bits too early
i2c-pxa2xx: Fix register offsets
i2c-pxa2xx: pass of_node from platform driver to adapter and publish
i2c-pxa2xx: check timeout correctly
i2c-pxa2xx: add support for shared IRQ handler
i2c-pxa2xx: Add PCI support for PXA I2C controller
ARM: pxa2xx: reorganize I2C files
i2c-pxa2xx: use dynamic register layout
i2c-mxs: set controller to pio queue mode after reset
i2c-eg20t: support new device OKI SEMICONDUCTOR ML7213 IOH
i2c/busses: Add support for Diolan U2C-12 USB-I2C adapter
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 38077a65682..53e315e777f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2138,6 +2138,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 |