diff options
| author | David S. Miller <[email protected]> | 2014-06-04 06:32:12 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2014-06-04 06:32:12 +0000 |
| commit | c99f7abf0e69987e4add567e155e042cb1f2a20b (patch) | |
| tree | d23898dc30ed25c1dae9bb6325041027d412397a /drivers/net/xen-netback/interface.c | |
| parent | net: remove some unless free on failure in alloc_netdev_mqs() (diff) | |
| parent | sh_eth: fix SH7619/771x support (diff) | |
| download | kernel-c99f7abf0e69987e4add567e155e042cb1f2a20b.tar.gz kernel-c99f7abf0e69987e4add567e155e042cb1f2a20b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
include/net/inetpeer.h
net/ipv6/output_core.c
Changes in net were fixing bugs in code removed in net-next.
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'drivers/net/xen-netback/interface.c')
0 files changed, 0 insertions, 0 deletions