Merge HEAD from gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git
author <greg@echidna.(none)> <>
Mon, 5 Sep 2005 16:20:31 +0000 (09:20 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 5 Sep 2005 16:20:31 +0000 (09:20 -0700)

Trivial merge