Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Dec 2009 22:11:56 +0000 (14:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Dec 2009 22:11:56 +0000 (14:11 -0800)
commit5443040754207f9777f71c892c66e45ba56b0fc1
treeb85a0272b5d5cc8c90d49d9e4856b3d694071d96
parent3ea6b3d0e6d0ffd91c0f8cadeb69b7133c038b32
parent54067ee20645a4ee12a9546aeb3b048b4c44cf60
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