From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 4 Apr 2007 15:36:01 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.21-rc6~18
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b6d3d16e26da996d301aec0bbce5c26a0cdcf6ac;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:
  r8169: fix suspend/resume for down interface
  r8169: issue request_irq after the private data are completely initialized
  b44: fix IFF_ALLMULTI handling of CAM slots
  cxgb3 - Firwmare update
  cxgb3 - Tighten xgmac workaround
  cxgb3 - detect NIC only adapters
  cxgb3 - Safeguard TCAM size usage
---

b6d3d16e26da996d301aec0bbce5c26a0cdcf6ac