commit | 42fe55ce905212542426fa6407a76534a5fb696a | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 30 10:03:46 2012 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 30 10:03:46 2012 -0700 |
tree | 874c5984e4222ea253b78c5be4755b3d31da54e2 | |
parent | 19ce0a995ff230b364c7329fd488c70e91c171d9 [diff] | |
parent | 14674e70119ea01549ce593d8901a797f8a90f74 [diff] |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/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