| commit | af5fdf80645304e7077ab876a43b325425c7ef70 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 30 14:50:44 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 30 14:50:44 2009 -0800 |
| tree | f832bcdc45c60a7858b64f0a340cd10934c3eb9f | |
| parent | 07a6d5a49c985ae6111221b93b3a48772cc4b976 [diff] | |
| parent | 4d29196c535088e807061ce2a0aa526daec2edfb [diff] |
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: at24: Use timeout also for read i2c: Fix userspace_device list corruption MAINTAINERS: Add missing i2c files i2c/tsl2550: Fix lux value in extended mode