Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/i2c-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 1 Jun 2005 14:56:10 +0000 (07:56 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 1 Jun 2005 14:56:10 +0000 (07:56 -0700)
commita340ba1071ccec7da5d5c689471ff8bc07fe022d
treefed7227b357b068878488ff7d77b8b7f0b489371
parentc10fccddf00cb216349ce3171ce2e39d7c70371b
parent4a4e5787e0b721021fe0a456ddc987a04cebfc8d
Merge ... /pub/scm/linux/kernel/git/gregkh/i2c-2.6