From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 Nov 2010 22:03:17 +0000 (-0800)
Subject: Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar... 
X-Git-Tag: MMI-PSA29.97-13-9~21750
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fe9d1159b299642f9e1a9b56bbf67a24c31bb418;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

fe9d1159b299642f9e1a9b56bbf67a24c31bb418