From: David S. Miller <davem@davemloft.net>
Date: Sun, 10 May 2015 02:23:59 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... 
X-Git-Tag: v4.1-rc4~26^2~16
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7c0004d3960a3ebffc68c372dfd98c09d1c680eb;p=karo-tx-linux.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-05-07

This series contains updates to igb only.

Toshiaki provides two fixes for igb, first fixes an issue when changing
the number of rings by ethtool which causes oops because of uninitialized
pointers.  The second fix resolves a typo where tx_ring was used instead
of the desired rx_ring.
====================

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

7c0004d3960a3ebffc68c372dfd98c09d1c680eb