summaryrefslogtreecommitdiffstats
path: root/drivers/net/s2io.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-01 07:58:38 +0100
committerJeff Garzik <jeff@garzik.org>2006-03-01 07:58:38 +0100
commit68727fed5469100bec0764207d7efb7a9ecdee29 (patch)
tree7afb58ab7665b90122d3b4505be5c6c9f8bade4b /drivers/net/s2io.h
parentMerge branch 'master' (diff)
parentMerge branch 'e1000' of ssh://198.78.49.142/srv/git/intel/linux-2.6 (diff)
downloadlinux-68727fed5469100bec0764207d7efb7a9ecdee29.tar.xz
linux-68727fed5469100bec0764207d7efb7a9ecdee29.zip
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/s2io.h')
0 files changed, 0 insertions, 0 deletions