tree b2e6d5ded33b89d294c5b97e29c440e302155a1c
parent 90768c09bca4f306c00a0cdbcb2f82601231e93e
parent fa16eefd3e835dd81c688a2a743eb59331162ed5
author Linus Torvalds <torvalds@linux-foundation.org> 1207926651 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1207926651 -0700

Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c-tiny-usb: New VID/PID pair
  i2c-davinci: Fix lost interrupt
  i2c-ibm_iic: Fast mode parm desc fixup