Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
authorDavid S. Miller <davem@davemloft.net>
Sun, 12 Feb 2012 22:05:16 +0000 (17:05 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 12 Feb 2012 22:05:16 +0000 (17:05 -0500)
commit3cc26e36a0862f8d6906bd2ad6d371f2933bc355
tree12c4d9d282802bd7252d7ef88a72ec3d5799dc5d
parentd5ef8a4d87ab21d575ac86366599c9152a28028d
parent4031ae6edb92f7e0aade76357813211ae0520a5c
Merge branch 'master' of git://git./linux/kernel/git/jkirsher/net-next
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c