Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Oct 2010 19:46:24 +0000 (12:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Oct 2010 19:46:24 +0000 (12:46 -0700)
commitbdaf12b41235b0c59949914de022341e77907461
tree2473bf0e3a28fdc2285cf830c9a259d9b85a4061
parent7c024e9534f9edd8d052380a1b40d376c8feb11b
parentbf5d95c82692ead9ba7876af73dac2edcc8a6191
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:
  i2c-viapro: Don't log nacks
  i2c/pca954x: Remove __devinit and __devexit from probe and remove functions
  MAINTAINERS: Add maintainer for PCA9541 I2C bus master selector driver
  i2c/mux: Driver for PCA9541 I2C Master Selector
  i2c: Optimize function i2c_detect()
  i2c: Discard warning message on device instantiation from user-space
  i2c-amd8111: Add proper error handling
  i2c: Change to new flag variable
  i2c: Remove unneeded inclusions of <linux/i2c-id.h>
  i2c: Let i2c_parent_is_i2c_adapter return the parent adapter
  i2c: Simplify i2c_parent_is_i2c_adapter
  i2c-pca-platform: Change device name of request_irq
  i2c: Fix Kconfig dependencies
MAINTAINERS