tree f832bcdc45c60a7858b64f0a340cd10934c3eb9f
parent 07a6d5a49c985ae6111221b93b3a48772cc4b976
parent 4d29196c535088e807061ce2a0aa526daec2edfb
author Linus Torvalds <torvalds@linux-foundation.org> 1259621444 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1259621444 -0800

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