summaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-04-14 21:44:14 +0200
committerDavid S. Miller <davem@davemloft.net>2015-04-14 21:44:14 +0200
commit87ffabb1f055e14e7d171c6599539a154d647904 (patch)
tree56f227c9cb668686ca5c2cd9a7ae188b74c0f2f2 /COPYING
parentMerge branch 'cxgb4-next' (diff)
parenttcp: tcp_make_synack() should clear skb->tstamp (diff)
downloadlinux-87ffabb1f055e14e7d171c6599539a154d647904.tar.xz
linux-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 <davem@davemloft.net>
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions