summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 13:52:24 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 13:52:24 -0700
commit1ee9bed173acd2f505f4e76e69d13cb2b82963e9 (patch)
treeab013f11162db850e3e0484d7036288f3cfc9833 /include/linux
parent1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 (diff)
parent45ac56ca6403b83ad880083be164c425f4b50882 (diff)
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions