diff options
| author | David S. Miller <[email protected]> | 2014-01-18 08:55:41 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2014-01-18 08:55:41 +0000 |
| commit | 41804420586ab41049a14ab7ef04eaa2280b8647 (patch) | |
| tree | f05b39b0c5f1ed229b073f7a993ef717f9f1a363 /net/unix/af_unix.c | |
| parent | Merge branch 'ixgbevf' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-41804420586ab41049a14ab7ef04eaa2280b8647.tar.gz kernel-41804420586ab41049a14ab7ef04eaa2280b8647.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
net/ipv4/tcp_metrics.c
Overlapping changes between the "don't create two tcp metrics objects
with the same key" race fix in net and the addition of the destination
address in the lookup key in net-next.
Minor overlapping changes in bnx2x driver.
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions