Merge git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 17 May 2006 23:13:25 +0000 (16:13 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 17 May 2006 23:13:25 +0000 (16:13 -0700)
* 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


Trivial merge