summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-02 10:40:40 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-02 10:40:40 -0700
commitdb7a89db5e3bc6ba131965183577b15fd6fc92cc (patch)
tree3379e5ceced69c41b24c68d571a103b71c246b14 /net
parent2910ca6f8ae69648623b3c05b79be87dd7bda73d (diff)
parentf662fe5a0b144efadbfc00e8040e603ec318746e (diff)
downloadop-kernel-dev-db7a89db5e3bc6ba131965183577b15fd6fc92cc.zip
op-kernel-dev-db7a89db5e3bc6ba131965183577b15fd6fc92cc.tar.gz
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: dm9601: Fix receive MTU mv643xx_eth: Do not modify struct netdev tx_queue_len qla3xxx: bugfix: Fix VLAN rx completion handling. qla3xxx: bugfix: Add memory barrier before accessing rx completion.
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud