From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 4 Oct 2009 21:59:14 +0000 (-0700)
Subject: Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=663cc813a8da4dcc35043998c8856e6ff2ee48fd;p=openwrt%2Fstaging%2Fblogic.git

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
---

663cc813a8da4dcc35043998c8856e6ff2ee48fd