aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-10 12:21:25 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-10 12:21:25 -0700
commitbc68552faad0e134eb22281343d5ae5a4873fa80 (patch)
tree2dc4d4339e6012049be4c1c548d226d78fc1090a /include
parentMerge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff)
parent[DECNET]: Use sk_stream_error function rather than DECnet's own (diff)
downloadlinux-dev-bc68552faad0e134eb22281343d5ae5a4873fa80.tar.xz
linux-dev-bc68552faad0e134eb22281343d5ae5a4873fa80.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions