]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 4 Oct 2012 19:49:16 +0000 (15:49 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 4 Oct 2012 19:49:16 +0000 (15:49 -0400)
Jeff Kirsher says:

====================
This series contains fixes/updates to ixgbe only.  There are three
PTP fixes, polling loop fix and the addition of a device id (X540-AT1).
====================

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

Trivial merge