summaryrefslogtreecommitdiff
path: root/trafgen/Makefile
diff options
context:
space:
mode:
authorVadim Kochan <vadim4j@gmail.com>2015-05-05 13:29:24 +0300
committerTobias Klauser <tklauser@distanz.ch>2015-05-05 14:40:26 +0200
commitd8f6f8236b29ff573415d3730a66a4a39e2fb443 (patch)
tree6d547496776dcb436794bea4c3d5e268aa1a610d /trafgen/Makefile
parent67e0574edb3c6919382ff96da1bcd800f9bfe45e (diff)
netsniff-ng nlmsg: Print family & type in less mode
Print 'Family' and 'Type' (considering family) fields in less mode. Signed-off-by: Vadim Kochan <vadim4j@gmail.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'trafgen/Makefile')
0 files changed, 0 insertions, 0 deletions
gpio?h=nds-private-remove&id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&id2=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 'include/dt-bindings/gpio')