summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 22:51:01 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 22:51:01 +0400
commit1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 (patch)
treecd885281545be78512dddc44fb8f9b76771d0186 /net
parent8920e8f94c44e31a73bdf923b04721e26e88cadd (diff)
parent6a690df5c8b37d4a1c41df40770d42d44fac0e97 (diff)
downloadlinux-1b11d78cf87a7014f96e5b7fa2e1233cc8081a00.tar.xz
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions