Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
commit332e4af80d1214fbf0e263e1408fc7c5b64ecdd6
authorDavid S. Miller <davem@davemloft.net>
Sun, 29 Jun 2008 04:28:46 +0000 (28 21:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 29 Jun 2008 04:28:46 +0000 (28 21:28 -0700)
tree7c8f8ada7ab8fc9cb2497d95e52dce4d2c4493a3
parent1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9
parentbe0976be9148f31ee0d1997354c3e30ff8d07587
Merge branch 'davem-next' of /linux/kernel/git/jgarzik/netdev-2.6
drivers/net/e1000e/netdev.c
drivers/net/igb/igb_main.c
drivers/net/ixgbe/ixgbe_main.c