From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 15 Mar 2007 22:31:37 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.21-rc4~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b810cdfcf91d76f603fd48023aede48ced8e6bed;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:
  natsemi: Avoid IntrStatus lossage if RX state machine resets.
  natsemi: Fix NAPI for interrupt sharing
  natsemi: Consistently use interrupt enable/disable functions
  NetXen: Fix softlockup seen during hardware access
  NetXen: Bug fix for Jumbo frames on XG card
  skge: set mac address bonding fix
---

b810cdfcf91d76f603fd48023aede48ced8e6bed