Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 4 Apr 2007 15:36:01 +0000 (08:36 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 4 Apr 2007 15:36:01 +0000 (08:36 -0700)
commitb6d3d16e26da996d301aec0bbce5c26a0cdcf6ac
tree752283d85dfe97329776e5a5493031ef17d795b5
parent348e3fd19487534d9d4dd70c3ad0b751afd35792
parent1371fa6db0bbb8e23f988a641f5ae7361bc629dd
Merge branch 'upstream-linus' of /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