Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
commitecefe4a1c3dcc802c23ef42de6caa08730cfc1a1
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 15 Nov 2007 19:01:07 +0000 (15 11:01 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 15 Nov 2007 19:01:07 +0000 (15 11:01 -0800)
tree1f3424530cee33bf3d0561af6af5b5b1ce792527
parent279e1dab949d33737557babfe9f74e0b74fbe39a
parent8b925a3dd8a4d7451092cb9aa11da727ba69e0f0
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/eeprom: Recognize VGN as a valid Sony Vaio name prefix
  i2c/eeprom: Hide Sony Vaio serial numbers
  i2c-pasemi: Fix NACK detection
  i2c-pasemi: Replace obsolete "driverfs" reference with "sysfs"
  i2c: Make i2c_check_addr static
  i2c-dev: Unbound new-style i2c clients aren't busy
  i2c-dev: "how does it work" comments