From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Dec 2009 22:11:56 +0000 (-0800)
Subject: Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=5443040754207f9777f71c892c66e45ba56b0fc1;p=deliverable%2Flinux.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-core: i2c bus should support PM entries in struct dev_pm_ops
  i2c: Get rid of I2C_CLIENT_MODULE_PARM
  i2c: Drop I2C_CLIENT_INSMOD_2 to 8
  i2c: Drop I2C_CLIENT_INSMOD_1
  i2c: Get rid of struct i2c_client_address_data
  i2c: Drop the kind parameter from detect callbacks
---

5443040754207f9777f71c892c66e45ba56b0fc1