tree 3379e5ceced69c41b24c68d571a103b71c246b14
parent 2910ca6f8ae69648623b3c05b79be87dd7bda73d
parent f662fe5a0b144efadbfc00e8040e603ec318746e
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1191346840 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1191346840 -0700

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.