Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 22:13:53 +0000 (14:13 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 22:13:53 +0000 (14:13 -0800)

Trivial merge