Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net...
authorDavid S. Miller <davem@davemloft.net>
Sun, 21 Aug 2011 00:25:36 +0000 (17:25 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 21 Aug 2011 00:25:36 +0000 (17:25 -0700)
commitca1ba7caa68520864e4b9227e67f3bbc6fed373b
tree84010e15b506f0506c15dbf03794dd8b776074ea
parent6461be3a54f802e00d5dcba3537271f92a90eaf3
parent66f32a8b97f11ad73d2e7b8c192c55febb20b425
Merge branch 'master' of /linux/kernel/git/jkirsher/net-next

Conflicts:
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/intel/e1000e/e1000.h
drivers/net/ethernet/intel/e1000e/ethtool.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c