summaryrefslogtreecommitdiffstats
path: root/net/x25/x25_dev.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 08:04:01 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 08:04:01 -0800
commit8cde0776ec1e86c270f65bf482f96288e6bf0023 (patch)
tree6350a8d67bea7bcdcbd1705a54f1b8e409a28775 /net/x25/x25_dev.c
parent2ed5e6d09e266bd2288d49aaaf240ed8c468c13c (diff)
parentb78612b796b0d6cdfba553d456eff008278830e3 (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'net/x25/x25_dev.c')
0 files changed, 0 insertions, 0 deletions