summaryrefslogtreecommitdiff
path: root/net/l2tp
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-09-21 02:33:42 (GMT)
committerDavid S. Miller <davem@davemloft.net>2012-09-21 02:33:42 (GMT)
commitb216a4d86fb599fa2808ea7456e15ca9b47bc756 (patch)
tree5eac23884cd85d45851c223dbc1822a9bf378cd3 /net/l2tp
parent127a479442790d175811547dd95241dce9812ec5 (diff)
parent012dc19a45b2b9cc2ebd14aaa401cf782c2abba4 (diff)
downloadlinux-fsl-qoriq-b216a4d86fb599fa2808ea7456e15ca9b47bc756.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says: ==================== This series contains updates to igb and ixgbevf. v2: updated patch description in 04 patch (ixgbevf: scheduling while atomic in reset hw path) ... Akeem G. Abodunrin (1): igb: Support to enable EEE on all eee_supported devices Alexander Duyck (2): igb: Remove artificial restriction on RQDPC stat reading ixgbevf: Add support for VF API negotiation John Fastabend (1): ixgbevf: scheduling while atomic in reset hw path ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
0 files changed, 0 insertions, 0 deletions