Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Apr 2008 15:10:51 +0000 (08:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Apr 2008 15:10:51 +0000 (08:10 -0700)
commit099ce8f4712dcff975ed7619f831b4df95aac773
treeb2e6d5ded33b89d294c5b97e29c440e302155a1c
parent90768c09bca4f306c00a0cdbcb2f82601231e93e
parentfa16eefd3e835dd81c688a2a743eb59331162ed5
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