Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 2 Oct 2007 17:40:40 +0000 (10:40 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 2 Oct 2007 17:40:40 +0000 (10:40 -0700)
commitdb7a89db5e3bc6ba131965183577b15fd6fc92cc
tree3379e5ceced69c41b24c68d571a103b71c246b14
parent2910ca6f8ae69648623b3c05b79be87dd7bda73d
parentf662fe5a0b144efadbfc00e8040e603ec318746e
Merge branch 'upstream-linus' of /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.