summaryrefslogtreecommitdiffstats
path: root/drivers/parisc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 09:39:05 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 09:39:05 -0800
commitcf10b2853f86e714eac7117484c0d368ce710fa4 (patch)
tree6f1574a9de786c8c345ac852eff12d65b2d75bfe /drivers/parisc
parent14591de147f7c9656fa2b9c05680d2b46e286c40 (diff)
parent166c3436d683cfe5316c7723ed746a93db053f12 (diff)
downloadlinux-cf10b2853f86e714eac7117484c0d368ce710fa4.tar.bz2
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/parisc')
0 files changed, 0 insertions, 0 deletions