From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Nov 2009 22:50:44 +0000 (-0800)
Subject: Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar... 
X-Git-Tag: v2.6.32~35
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=af5fdf80645304e7077ab876a43b325425c7ef70;p=safe%2Fjmp%2Flinux-2.6

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
---

af5fdf80645304e7077ab876a43b325425c7ef70