Merge master.kernel.org:/home/rmk/linux-2.6-i2c
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 14 Sep 2005 22:20:04 +0000 (15:20 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 14 Sep 2005 22:20:04 +0000 (15:20 -0700)

Trivial merge