tree dbaf7109edaaa26496e131e6644074fbcb75c75d
parent 0be8c8bd1de21d75ef14eb6af35b664f70a35746
parent 0cc43a1806f078f7fd414850d8f1f1761696e4af
author Linus Torvalds <torvalds@linux-foundation.org> 1294708153 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294708153 -0800

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:
  i2c: Constify i2c_client where possible
  i2c-algo-bit: Complain about masters which can't read SCL
  i2c-algo-bit: Refactor adapter registration
  i2c: Add generic I2C multiplexer using GPIO API
  i2c-nforce2: Remove unnecessary cast of pci_get_drvdata
  i2c-i801: Include <linux/slab.h>