From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 17 May 2006 23:13:25 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6
X-Git-Tag: v2.6.17-rc5~105
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9676489866a75fdd56b0d3e40ec7884298bb1338;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6:
  sky2: prevent dual port receiver problems
  x86_64: Check for bad dma address in b44 1GB DMA workaround
  The ixp2000 driver for the enp2611 was developed on a board with
---

9676489866a75fdd56b0d3e40ec7884298bb1338