tree bd487aea099fc96a795cb57a8799202fe3b027fa
parent cdb7532f7be35c3675b1aed54d10e378014618b6
parent a1ba15832c8f6ac2d5d193a6dbb91bcf7705b732
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1179882914 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1179882914 -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-s3c2410: Fix build warning
  i2c-tiny-usb: Fix truncated adapter name
  i2c: Legacy i2c drivers shouldn't issue uevents