Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 10 Sep 2007 21:42:39 +0000 (14:42 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 10 Sep 2007 21:42:39 +0000 (14:42 -0700)
commitf3f94ce5dba6e134cf0958dd3a42ab28a028fc83
tree4539d11ddc93f000c96e3a21976cf4b4fe6742d1
parent5d9adefc1e7218d060a88416943dd18e86c3c975
parent939bc4943d0483961edc45b63a7d27b4ffe547e3
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-algo-bit: Read block data bugfix
  i2c-pxa: Fix adapter number
  i2c-gpio: Fix adapter number