tree 72566bf1beefd3e1cc267e2dd5cc3188ab87b836
parent ceb804cd0f63b0e0a87b81913b66add6de03043d
parent 0a9c14751377a1407f5e35791e13651d2fc7801c
author Linus Torvalds <torvalds@linux-foundation.org> 1268590384 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1268590384 -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-algo-bit: Add pre- and post-xfer hooks
  at24: Init dynamic bin_attribute structures
  i2c: Drop configure option I2C_DEBUG_CHIP
  tsl2550: Move from i2c/chips to misc
  i2c-i801: Don't use the block buffer for I2C block writes
  i2c-powermac: Be less verbose in the absence of real errors.
  i2c-smbus: Use device_lock/device_unlock