diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 19:06:29 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 19:06:29 +0200 |
commit | 1c00650c233c404fadf9347329214d55283bd17a (patch) | |
tree | 9de7cda2fe2e54411cc24ff3befd758c9cb9cd74 /kernel | |
parent | Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/... (diff) | |
parent | i2c: I2C bus multiplexer driver pca954x (diff) | |
download | linux-1c00650c233c404fadf9347329214d55283bd17a.tar.xz linux-1c00650c233c404fadf9347329214d55283bd17a.zip |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions