diff options
| author | David S. Miller <[email protected]> | 2015-04-14 19:44:14 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2015-04-14 19:44:14 +0000 |
| commit | 87ffabb1f055e14e7d171c6599539a154d647904 (patch) | |
| tree | 56f227c9cb668686ca5c2cd9a7ae188b74c0f2f2 /drivers/infiniband/hw/mlx4/alias_GUID.c | |
| parent | Merge branch 'cxgb4-next' (diff) | |
| parent | tcp: tcp_make_synack() should clear skb->tstamp (diff) | |
| download | kernel-87ffabb1f055e14e7d171c6599539a154d647904.tar.gz kernel-87ffabb1f055e14e7d171c6599539a154d647904.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The dwmac-socfpga.c conflict was a case of a bug fix overlapping
changes in net-next to handle an error pointer differently.
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'drivers/infiniband/hw/mlx4/alias_GUID.c')
0 files changed, 0 insertions, 0 deletions