Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
authorDavid S. Miller <davem@davemloft.net>
Fri, 7 Dec 2012 17:32:47 +0000 (12:32 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Dec 2012 17:33:53 +0000 (12:33 -0500)
Jeff Kirsher says:

====================
This series contains updates to igb and ixgbe.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge