Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Linus Torvalds [Wed, 22 Jun 2005 17:42:54 +0000 (10:42 -0700)]

Trivial merge