summaryrefslogtreecommitdiff
path: root/dissector_80211.c
diff options
context:
space:
mode:
authorKartik Mistry <kartik.mistry@gmail.com>2015-05-09 20:16:50 +0530
committerTobias Klauser <tklauser@distanz.ch>2015-05-11 10:53:35 +0200
commit75162e7efe04bfc2bad6b0268bb562628ba0baf6 (patch)
tree9ca3e3f48a0640321ab3096bed329a271325fb5c /dissector_80211.c
parent9118e9e8673eb88ebf4f7af33d8ed9856f3ed554 (diff)
netsniff-ng: Fix typo Unkown -> Unknown
Fix typo in error message. Signed-off-by: Kartik Mistry <kartik.mistry@gmail.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'dissector_80211.c')
0 files changed, 0 insertions, 0 deletions
bf0d04a02eed6742 (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/rds/tcp_connect.c')