aboutsummaryrefslogtreecommitdiff
path: root/arch/i386
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-07 10:04:04 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-07 10:04:04 -0800
commit50753817a3043e0621e99f329514c0c7003563b2 (patch)
tree8db82800dc6673c76d48eaca5177c3d5dc119683 /arch/i386
parenteeb059e0a69369753b3e45426958f751f0b8fc89 (diff)
parent6967bd81d883ed325fd58840ee02a8da60458e6b (diff)
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'arch/i386')
0 files changed, 0 insertions, 0 deletions