tree f3bec4a8e4f9ab3d087ba95fc30a6d83ce93f134
parent 19fb1457990b6b7e15586ec7331541a184233acc
parent 187426e69afe0a2ad697c9c5f5f654254da0e3a0
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1197477831 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1197477831 -0800

Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c/isp1301_omap: Build fix
  i2c: Add missing spaces in split log messages
  i2c-gpio: Initialize adapter class
  i2c: Delete an outdated piece of documentation