Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 23 May 2007 01:15:14 +0000 (18:15 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 23 May 2007 01:15:14 +0000 (18:15 -0700)
commitad9ddd66c6e8a79630a975ff0bb8d45a11abe630
treebd487aea099fc96a795cb57a8799202fe3b027fa
parentcdb7532f7be35c3675b1aed54d10e378014618b6
parenta1ba15832c8f6ac2d5d193a6dbb91bcf7705b732
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-s3c2410: Fix build warning
  i2c-tiny-usb: Fix truncated adapter name
  i2c: Legacy i2c drivers shouldn't issue uevents