diff options
| author | David S. Miller <davem@davemloft.net> | 2012-10-04 15:49:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-04 15:49:16 -0400 |
| commit | e7b565e73d94e42619bbab7ea1ab5626d1952701 (patch) | |
| tree | 41da721dc5203eab4b4bdb8297c9aef602ee77c4 /net/sctp/input.c | |
| parent | f4ef85bbda96324785097356336bc79cdd37db0a (diff) | |
| parent | df376f0de167754da9b3ece4afdb5bb8bf3fbf3e (diff) | |
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/input.c')
0 files changed, 0 insertions, 0 deletions