summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 19:08:46 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 19:08:46 +0200
commit8ed575904373d7aaab7f15a8db2edc317a44df43 (patch)
tree3b2e92a396a1bbec8e1fb499f25e8aed93ab5692 /include/net
parentMerge master.kernel.org:/home/rmk/linux-2.6-mmc (diff)
parentAuto-update from upstream (diff)
downloadlinux-8ed575904373d7aaab7f15a8db2edc317a44df43.tar.xz
linux-8ed575904373d7aaab7f15a8db2edc317a44df43.zip
Merge branch 'forlinus' of git://parisc-linux.org/home/kyle/git/parisc-2.6
Diffstat (limited to 'include/net')
0 files changed, 0 insertions, 0 deletions