diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 13:46:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 13:46:13 -0800 |
| commit | aa303f2c06c0f3b42190b7e56c16bc856b1a1b28 (patch) | |
| tree | a916c85bbdd3a23e27c1f71aa90afe8a179d99bb /drivers/xen/biomerge.c | |
| parent | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media (diff) | |
| parent | Merge branches 'for-33/i2c/eg20t' and 'for-33/i2c/omap' into for-linus/i2c-33 (diff) | |
| download | linux-dev-aa303f2c06c0f3b42190b7e56c16bc856b1a1b28.tar.xz linux-dev-aa303f2c06c0f3b42190b7e56c16bc856b1a1b28.zip | |
Merge branch 'for-linus/i2c-33' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c-33' of git://git.fluff.org/bjdooks/linux:
i2c-eg20t: Change-company-name-OKI-SEMICONDUCTOR to LAPIS Semiconductor
i2c-eg20t: Support new device LAPIS Semiconductor ML7831 IOH
i2c-eg20t: modified the setting of transfer rate.
i2c-eg20t: use i2c_add_numbered_adapter to get a fixed bus number
i2c: OMAP: Add DT support for i2c controller
I2C: OMAP: NACK without STP
I2C: OMAP: correct SYSC register offset for OMAP4
Diffstat (limited to 'drivers/xen/biomerge.c')
0 files changed, 0 insertions, 0 deletions