Merge branch 'upstream-next-davem' of master.kernel.org:/pub/scm/linux/kernel/git...
authorDavid S. Miller <davem@davemloft.net>
Thu, 29 May 2008 10:31:03 +0000 (03:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 29 May 2008 10:31:03 +0000 (03:31 -0700)
commita5b17df04c4ad8f25fc598fce37fccb4b387c94c
tree2d0084f6db86362eb067b617ff8470f255ba37e7
parentb79eeeb9e48457579cb742cd02e162fcd673c4a3
parentc03571a3e22b821e5be7bda7b166c4554770f489
Merge branch 'upstream-next-davem' of /linux/kernel/git/jgarzik/netdev-2.6
drivers/net/3c509.c
drivers/net/Kconfig
drivers/net/phy/Kconfig
drivers/net/tg3.c
drivers/net/usb/rndis_host.c