summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 15:43:09 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 15:43:09 -0700
commitc0d6f9663b30a09ed725229b2d50391268c8538e (patch)
tree7ba471cf9632097682ab55689cd64c9a68e11235 /net
parent0db7443b2bd0b92da4e8afa46f8123a7076136c6 (diff)
parent6fd60fa97b706e52abba7c9f810b148aa230817f (diff)
downloadlinux-stable-c0d6f9663b30a09ed725229b2d50391268c8538e.tar.gz
linux-stable-c0d6f9663b30a09ed725229b2d50391268c8538e.tar.bz2
linux-stable-c0d6f9663b30a09ed725229b2d50391268c8538e.zip
Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually
Old tree, so the automatic merge had some problems.
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions