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)
commit9676489866a75fdd56b0d3e40ec7884298bb1338
tree75cbfb35f4e09ad15b8753191b566d401d86de56
parent15eb7105a74a0a5d72d006fec2192b0ec692b5cc
parent843a46f423a508b3a443a08baa903c6da02f3297
Merge git://git./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