Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git/
authorLinus Torvalds <torvalds@ppc970.osdl.org.(none)>
Tue, 19 Apr 2005 14:31:40 +0000 (07:31 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org.(none)>
Tue, 19 Apr 2005 14:31:40 +0000 (07:31 -0700)

Trivial merge