| commit | 663cc813a8da4dcc35043998c8856e6ff2ee48fd | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 4 Oct 2009 21:59:14 +0000 (4 14:59 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 4 Oct 2009 21:59:14 +0000 (4 14:59 -0700) | ||
| tree | 97e62a1250f4c64cb75455aa9796c5306bf996e1 | treesnapshot (tar.gz zip) |
| parent | 58e57fbd1c7e8833314459555e337364fe5521f3 | commitdiff |
| parent | 6f6b35e133fe4313277b30fc1a7ea313875ea6c9 | commitdiff |
Merge branch 'i2c-for-linus' of git://git./linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
macintosh: Don't assume i2c device probing always succeeds
i2c: Hide probe errors caused by ACPI resource conflicts
i2c: Minor documentation update
mfd: AB3100 drop unused module parameters
Staging: IIO: tsl2561: Drop unused module parameters
leds: leds-pca9532 - Drop unused module parameters
ltc4215/ltc4245: Discard obsolete detect methods
ds2482: Discard obsolete detect method
max6875: Discard obsolete detect method
i2c: Move misc devices documentation
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
macintosh: Don't assume i2c device probing always succeeds
i2c: Hide probe errors caused by ACPI resource conflicts
i2c: Minor documentation update
mfd: AB3100 drop unused module parameters
Staging: IIO: tsl2561: Drop unused module parameters
leds: leds-pca9532 - Drop unused module parameters
ltc4215/ltc4245: Discard obsolete detect methods
ds2482: Discard obsolete detect method
max6875: Discard obsolete detect method
i2c: Move misc devices documentation