summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-18 22:44:23 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-18 22:44:23 -0800
commitb92c617d88deda085e7209bffe47fc1817e18d8b (patch)
treecdc817ad82bbeea43e4587b9737f6691cdf5c75e /kernel
parent2f30a379dd346c51a2693c5872c56a0fc2e2982f (diff)
parentce1061cb7ebe9c32d1948c166e217a64093aeb9f (diff)
Merge bk://kernel.bkbits.net/gregkh/linux/i2c-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions