Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net
authorDavid S. Miller <[email protected]>
Wed, 8 Aug 2012 22:41:04 +0000 (15:41 -0700)
committerDavid S. Miller <[email protected]>
Wed, 8 Aug 2012 22:41:04 +0000 (15:41 -0700)
Peter P Waskiewicz Jr says:

====================
This series contains fixes to the e1000e and igb drivers.
====================

Signed-off-by: David S. Miller <[email protected]>

Trivial merge