From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Apr 2008 15:10:51 +0000 (-0700)
Subject: Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
X-Git-Tag: v2.6.25-rc9~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=099ce8f4712dcff975ed7619f831b4df95aac773;p=linux-2.6

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
---

099ce8f4712dcff975ed7619f831b4df95aac773