Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 May 2010 22:20:37 +0000 (15:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 May 2010 22:20:37 +0000 (15:20 -0700)
commitc81406d6423416f1e18a8a41a3b7ac415fdf13d3
treea0a41d81d102670cc37b0ce5e8373b66f09b27e1
parentf5fa05d97252b23b12749a7cd02710870c0762b0
parent6629dcff19470a894ce294d0adb9cbab94ee1fb9
Merge branch 'i2c-for-linus' of git://git./linux/kernel/git/jdelvare/staging

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c-core: Use per-adapter userspace device lists
  i2c: Fix probing of FSC hardware monitoring chips
  i2c-core: Erase pointer to clientdata on removal