Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
authorDavid S. Miller <davem@davemloft.net>
Wed, 16 Nov 2011 23:31:56 +0000 (18:31 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Nov 2011 23:31:56 +0000 (18:31 -0500)
commitf85fa279138489543206381883c8f67ef94aa912
treed54d632556885732e94cf18c7cf8d3bef2c740b5
parent358b838291f618278080bbed435b755f9b46748e
parentea99d832cce7e724ba37c488e0571a00cb14d430
Merge branch 'master' of git://git./linux/kernel/git/jkirsher/net-next
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/ethernet/intel/igbvf/netdev.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c