From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 2 Oct 2007 17:40:40 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.23~38
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=db7a89db5e3bc6ba131965183577b15fd6fc92cc;p=linux-2.6-omap-h63xx.git

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.
---

db7a89db5e3bc6ba131965183577b15fd6fc92cc