From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 28 Sep 2007 22:32:29 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.23-rc9~21
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f100353ff5bfd83be00ae55e98b4d611d2eb5681;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:
  e1000: Add device IDs of blade version of the 82571 quad port
  sky2: fix transmit state on resume
  sky2: FE+ vlan workaround
  sky2: sky2 FE+ receive status workaround
---

f100353ff5bfd83be00ae55e98b4d611d2eb5681