summaryrefslogtreecommitdiff
path: root/str.h
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2015-03-19 10:13:56 +0100
committerDaniel Borkmann <dborkman@redhat.com>2015-03-19 10:13:56 +0100
commit3dfaab495b62658b88a1ed201b2ed61aea34570d (patch)
tree5a9d7a544a32364c8534e31b898eabbd01edbd31 /str.h
parent6f542884d002d55d517a50dd9892068e95400b25 (diff)
authors: add Vadim for his contributions
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'str.h')
0 files changed, 0 insertions, 0 deletions
v class='commit-subject'>Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools')