diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-12-09 20:20:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-09 20:20:14 -0500 |
| commit | 34f9f437104b86f6ddfa2770e2cd852846385dc3 (patch) | |
| tree | 6c78386b3db9dd47fd2b79efb4dcf8c1472de99e /net/x25/x25_dev.c | |
| parent | pkt_sched: give visibility to mq slave qdiscs (diff) | |
| parent | packet: fix send path when running with proto == 0 (diff) | |
| download | linux-dev-34f9f437104b86f6ddfa2770e2cd852846385dc3.tar.xz linux-dev-34f9f437104b86f6ddfa2770e2cd852846385dc3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge 'net' into 'net-next' to get the AF_PACKET bug fix that
Daniel's direct transmit changes depend upon.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25/x25_dev.c')
0 files changed, 0 insertions, 0 deletions