summaryrefslogtreecommitdiff
path: root/staging/mz.h
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2014-06-12 15:56:21 +0200
committerTobias Klauser <tklauser@distanz.ch>2014-06-12 15:56:21 +0200
commit7a78872dc5fa22c834d12e1f909c4fdf68da1879 (patch)
treedc920475da8f01c4ea08f0d907f3c03194995768 /staging/mz.h
parentb0e03239c7e3ecc08c51daedfff3a9be04113a62 (diff)
netsniff-ng 0.5.9-rc1v0.5.9-rc1
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'staging/mz.h')
0 files changed, 0 insertions, 0 deletions
ff4a6715c11f7f2'>diff)parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (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 'net/tipc/name_table.h')