summaryrefslogtreecommitdiffstats
path: root/net/sctp
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-10-04 15:49:16 -0400
committerDavid S. Miller <davem@davemloft.net>2012-10-04 15:49:16 -0400
commite7b565e73d94e42619bbab7ea1ab5626d1952701 (patch)
tree41da721dc5203eab4b4bdb8297c9aef602ee77c4 /net/sctp
parentf4ef85bbda96324785097356336bc79cdd37db0a (diff)
parentdf376f0de167754da9b3ece4afdb5bb8bf3fbf3e (diff)
downloadlinux-e7b565e73d94e42619bbab7ea1ab5626d1952701.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'net/sctp')
0 files changed, 0 insertions, 0 deletions