Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Nov 2010 22:03:17 +0000 (14:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Nov 2010 22:03:17 +0000 (14:03 -0800)
commitfe9d1159b299642f9e1a9b56bbf67a24c31bb418
tree530c6e41beb784adb16a1faae2839edbad2fbb7f
parente5c13537b0153010b4f65b9c55faa78a4c151c93
parent2236baa75f704851d3cd3310569058151acb1f06
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: Sanity checks on adapter registration
  i2c: Mark i2c_adapter.id as deprecated
  i2c: Drivers shouldn't include <linux/i2c-id.h>
  i2c: Delete unused adapter IDs
  i2c: Remove obsolete cleanup for clientdata