Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 14 Jan 2008 21:23:20 +0000 (13:23 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 14 Jan 2008 21:23:20 +0000 (13:23 -0800)
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c-sibyte: Fix an error path
  i2c: Driver IDs are optional
  i2c: Spelling fixes
  i2c-omap: Fix NULL pointer dereferencing


Trivial merge