tree c16583342b871107f6805c21da4b1a96cfaa7aac
parent 0cfdc724390fb9370f27bb9a133eadf69114dd21
parent 06a67848c6681a73e621e47c056490d51a07289f
author Linus Torvalds <torvalds@linux-foundation.org> 1320015299 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1320015299 -0700

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: Functions for byte-swapped smbus_write/read_word_data
  i2c-algo-pca: Return standard fault codes
  i2c-algo-bit: Return standard fault codes
  i2c-algo-bit: Be verbose on bus testing failure
  i2c-algo-bit: Let user test buses without failing
  i2c/scx200_acb: Fix section mismatch warning in scx200_pci_drv
  i2c: I2C_ELEKTOR should depend on HAS_IOPORT