Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
authorLinus Torvalds <torvalds@evo.osdl.org>
Tue, 6 Sep 2005 07:31:02 +0000 (00:31 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Tue, 6 Sep 2005 07:31:02 +0000 (00:31 -0700)

Trivial merge