From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Aug 2010 17:06:29 +0000 (-0700)
Subject: Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar... 
X-Git-Tag: v3.0~3635
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c00650c233c404fadf9347329214d55283bd17a;p=platform%2Fkernel%2Flinux-amlogic.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: I2C bus multiplexer driver pca954x
  i2c: Multiplexed I2C bus core support
  i2c: Use a separate mutex for userspace client lists
  i2c: Make i2c_default_probe self-sufficient
  i2c: Drop dummy variable
  i2c: Move adapter locking helpers to i2c-core
  V4L/DVB: Use custom I2C probing function mechanism
  i2c: Add support for custom probe function
  i2c-dev: Use memdup_user
  i2c-dev: Remove unnecessary kmalloc casts
---

1c00650c233c404fadf9347329214d55283bd17a