summaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-04 23:59:14 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-04 23:59:14 +0200
commit663cc813a8da4dcc35043998c8856e6ff2ee48fd (patch)
tree97e62a1250f4c64cb75455aa9796c5306bf996e1 /drivers/of
parentMerge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff)
parentmacintosh: Don't assume i2c device probing always succeeds (diff)
downloadlinux-663cc813a8da4dcc35043998c8856e6ff2ee48fd.tar.xz
linux-663cc813a8da4dcc35043998c8856e6ff2ee48fd.zip
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/of')
0 files changed, 0 insertions, 0 deletions