Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 22:50:44 +0000 (14:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 22:50:44 +0000 (14:50 -0800)
commitaf5fdf80645304e7077ab876a43b325425c7ef70
treef832bcdc45c60a7858b64f0a340cd10934c3eb9f
parent07a6d5a49c985ae6111221b93b3a48772cc4b976
parent4d29196c535088e807061ce2a0aa526daec2edfb
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:
  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
MAINTAINERS