tree 8fa745403e1506c211d00ce787d71ee647d65ea2
parent 08249903ea233a79b4167395f2fb79ccd1fb5f94
parent 66c7acf61dc6b27954bb9ceb8617d447ac03734a
author Linus Torvalds <torvalds@linux-foundation.org> 1231358367 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1231358367 -0800

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: Use snprintf to set adapter names
  Input: apanel - convert to new i2c binding
  i2c: Drop I2C_CLASS_CAM_DIGITAL
  i2c: Drop I2C_CLASS_CAM_ANALOG and I2C_CLASS_SOUND
  i2c: Drop I2C_CLASS_ALL
  i2c: Get rid of remaining bus_id access
  i2c: Replace bus_id with dev_name(), dev_set_name()