From: David S. Miller Date: Thu, 4 Oct 2012 19:49:16 +0000 (-0400) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net X-Git-Tag: MMI-PSA29.97-13-9~15834^2~9 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e7b565e73d94e42619bbab7ea1ab5626d1952701;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 --- e7b565e73d94e42619bbab7ea1ab5626d1952701