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)
commite7b565e73d94e42619bbab7ea1ab5626d1952701
tree41da721dc5203eab4b4bdb8297c9aef602ee77c4
parentf4ef85bbda96324785097356336bc79cdd37db0a
parentdf376f0de167754da9b3ece4afdb5bb8bf3fbf3e
Merge branch 'master' of git://git./linux/kernel/git/jkirsher/net

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>