diff options
author | Ben Dooks <ben-linux@fluff.org> | 2011-03-21 23:57:25 +0100 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2011-03-21 23:57:25 +0100 |
commit | a0774f4511371319418f959ce838f81d47a3fd56 (patch) | |
tree | 1a23cbcb83b4a384ef6659d95f7e32400e4ae010 /drivers/i2c | |
parent | Merge branch 'for-2639/i2c/i2c-u2c12' into for-linus/2639/i2c-12 (diff) | |
parent | i2c-pxa2xx: Fix register offsets (diff) | |
parent | i2c-eg20t: support new device OKI SEMICONDUCTOR ML7213 IOH (diff) | |
parent | i2c-mxs: set controller to pio queue mode after reset (diff) | |
download | linux-a0774f4511371319418f959ce838f81d47a3fd56.tar.xz linux-a0774f4511371319418f959ce838f81d47a3fd56.zip |
Merge branches 'for-2639/i2c/i2c-ce4100-v6', 'for-2639/i2c/i2c-eg20t-v3' and 'for-2639/i2c/i2c-imx' into for-linus/2639/i2c-2