tree a3c0573601942d86b1d4c1be4d446f31dfc78f5e
parent 6113f39dd15e4beb5ce66a8e0d9062477c5e81e3
parent 662cda8abb278f58237fa12b8ab3060ebefca4b8
author Linus Torvalds <torvalds@linux-foundation.org> 1300668853 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300668853 -0700

Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c-i801: SMBus patch for Intel DH89xxCC DeviceIDs
  i2c: Drop i2c_adapter.id
  i2c: Deprecate i2c_driver.attach_adapter and .detach_adapter
  i2c-dev: Use standard bus notification mechanism
  i2c: Export i2c_for_each_dev
  i2c: Get rid of <linux/i2c-id.h>
  i2c: Minor fixes to upgrading-clients document
  i2c: make i2c_get_adapter prototype clearer
  i2c: Fix typo in instantiating-devices document
  i2c-boardinfo: Fix typo in comment