summaryrefslogtreecommitdiff
path: root/ring.h
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-05-21 14:52:28 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-05-21 14:54:44 +0200
commit30652436efbaacfcbb9a507c23502b9d07a596de (patch)
tree2f6d6689b230552b2689c9f835f36cc78a289e12 /ring.h
parent96c7189548e13f0bbcdbf43811a5df1465c4e6d3 (diff)
mausezahn: do not show version in prompt
Do not show the old mausezahn version in the prompt, since we use a different versioning scheme. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'ring.h')
0 files changed, 0 insertions, 0 deletions
-remove&id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&id2=76e0e70e6452b971a69cc9794ff4a6715c11f7f2'>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/bluetooth/bnep/netdev.c')