From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Dec 2009 16:12:16 +0000 (-0800)
Subject: Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar... 
X-Git-Tag: v2.6.33-rc1~385
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41440ffe21f29bdb985cab76b2d0b06d83e63b19;p=platform%2Fkernel%2Flinux-3.10.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-stub: Documentation update
  i2c-stub: Allow user to disable some commands
  i2c-stub: Implement I2C block support
  i2c: Refactor for_each callbacks
  i2c-i801: Retry on lost arbitration
  i2c: Remove big kernel lock from i2cdev_open
  ics932s401: Clean up detect function
  i2c: Simplify i2c_detect_address
  i2c: Drop probe, ignore and force module parameters
  i2c: Add missing __devinit markers to old i2c adapter drivers
  i2c: Bus drivers don't have to support I2C_M_REV_DIR_ADDR
  i2c: Prevent priority inversion on top of bus lock
  i2c-voodoo3: Delete
  i2c-powermac: Drop temporary name buffer
  i2c-powermac: Include the i2c_adapter in struct pmac_i2c_bus
  i2c-powermac: Log errors
  i2c-powermac: Refactor i2c_powermac_smbus_xfer
  i2c-powermac: Reject unsupported I2C transactions
  i2c/chips: Move ds1682 to drivers/misc
---

41440ffe21f29bdb985cab76b2d0b06d83e63b19
diff --cc drivers/misc/Makefile
index e311267,b6245e4..906a0ed
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -20,7 -20,7 +20,8 @@@ obj-$(CONFIG_SGI_GRU)		+= sgi-gru
  obj-$(CONFIG_HP_ILO)		+= hpilo.o
  obj-$(CONFIG_ISL29003)		+= isl29003.o
  obj-$(CONFIG_EP93XX_PWM)	+= ep93xx_pwm.o
+ obj-$(CONFIG_DS1682)		+= ds1682.o
  obj-$(CONFIG_C2PORT)		+= c2port/
 +obj-$(CONFIG_IWMC3200TOP)      += iwmc3200top/
  obj-y				+= eeprom/
  obj-y				+= cb710/