projects / platform / kernel / linux-rpi3.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eb8e977 a4605fe)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
authorDavid S. Miller <davem@davemloft.net>
Tue, 5 Apr 2016 23:31:19 +0000 (19:31 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Apr 2016 23:31:19 +0000 (19:31 -0400)
commitaa4f069e167b8302b0ccf920bca389a1fbe2bc4a
tree475354a2f91547a5e077c4eba46aa22e6efd4130tree | snapshot
parenteb8e97715f29a1240cdf67b0df725be27433259fcommit | diff
parenta4605fef7132f19afded76ee025c957558271a7dcommit | diff
Merge branch 'master' of git://git./linux/kernel/git/jkirsher/net-queue

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2016-04-05

This series contains updates to i40e and e1000.

Jesse fixes an issue where code was added by a previous commit but the
flag to enable it was never set.

Alex fixes the e1000 driver from grossly overestimated the descriptors
needed to transmit a frame.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Domain: System / Kernel; Licenses: GPL-2.0;