Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 22 Jun 2005 17:42:54 +0000 (10:42 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 22 Jun 2005 17:42:54 +0000 (10:42 -0700)
commit4e93d3e8859c834ee18dfd33051d24df8669d0c0
tree13f5b39730857257b5040471618e9bcce30ed9cc
parenta0cd30fd26a398c0c6e50c6760610d4529f17a84
parent0087e5ef577d0d6e664be7ab4be513b6a482e7ec
Merge /pub/scm/linux/kernel/git/gregkh/i2c-2.6