From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 30 May 2012 17:03:46 +0000 (-0700)
Subject: Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar... 
X-Git-Tag: v3.5-rc1~38
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42fe55ce905212542426fa6407a76534a5fb696a;p=pandora-kernel.git

Merge branch 'i2c-for-linus' of git://git./linux/kernel/git/jdelvare/staging

Pull i2c updates from Jean Delvare.

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING
  i2c-dev: Add support for I2C_M_RECV_LEN
---

42fe55ce905212542426fa6407a76534a5fb696a