tree cb28782aa447fe84b4f6a3c51e9b4d65766bb1d9
parent 655c5d8fc110a9d4f90cc831bd009936f3e8df28
parent 96f699ad09c8b3c55cd229506a9add0047838e3e
author Linus Torvalds <torvalds@linux-foundation.org> 1248816662 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1248816662 -0700

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/tsl2550: Fix lux value in dark environment