]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://kernel.bkbits.net/gregkh/linux/i2c-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 15 Mar 2004 13:07:15 +0000 (05:07 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 15 Mar 2004 13:07:15 +0000 (05:07 -0800)
into ppc970.osdl.org:/home/torvalds/v2.5/linux


Trivial merge