summaryrefslogtreecommitdiff
path: root/ioops.h
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-06-04 14:43:22 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-06-04 14:43:22 +0200
commit59ebf2978741fb4cf0086440e23a1fcb522fdc21 (patch)
tree167454002491bb6022da177bcfbc2eb4d3244f02 /ioops.h
parent4d3be7be483f92030912e976e4dea24edd723f34 (diff)
curve: move taia related functions into own header
Move them into a separate header, structures and inline functions, since they are more or less independant of curve.h. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'ioops.h')
0 files changed, 0 insertions, 0 deletions
-private-remove&id=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
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/testing/ktest')