summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-15 03:46:41 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-15 03:46:41 +0100
commit11c18b5cb31d15a782fb727adad51ae1434e5dee (patch)
treed7f24da736b9c840ea57a43150c5a9466b38d78a /init
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff)
parent[VLAN]: Fix hardware rx csum errors (diff)
downloadlinux-11c18b5cb31d15a782fb727adad51ae1434e5dee.tar.xz
linux-11c18b5cb31d15a782fb727adad51ae1434e5dee.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions