diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-14 09:52:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-14 09:52:12 -0700 |
| commit | 3b993e8bee32d6dfe04df560eda8e1aff6248a22 (patch) | |
| tree | a3d9950b941276799b25194e0c1c400693c09809 /fs | |
| parent | ab3c556de19b1888b0830ef066524884d4788131 (diff) | |
| parent | b5d0b4ba389711183b5af71438fe21b40ee32d6d (diff) | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c-s3c2410: Build fix
i2c/menelaus: Build fix
i2c-mv64xxx: Reinitialize hw and driver on I2C bus hang
i2c-mpc: Don't disable I2C module on stop condition
i2c-iop3xx: Set I2C_CLASS_HWMON to adapter class
i2c/isp1301_omap: Build fixes, whitespace
i2c-mpc: Pass correct dev_id to free_irq on error path
i2c-i801: Typo: erroneous
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions