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)
commit031f2dcd7075e218e74dd7f942ad015cf82dffab
treed7ee06c0fcfb2e841230e38de704dd0fed60bd7e
parenta98fdcef941e107eeabae622d85a1f476f25a160
parent5cd6e675f862568ad73c061665ee5080cfd952c5
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-sibyte: Fix an error path
  i2c: Driver IDs are optional
  i2c: Spelling fixes
  i2c-omap: Fix NULL pointer dereferencing