summaryrefslogtreecommitdiff
path: root/lockme.h
diff options
context:
space:
mode:
authorVadim Kochan <vadim4j@gmail.com>2015-11-12 08:54:18 +0200
committerTobias Klauser <tklauser@distanz.ch>2015-11-16 09:14:41 +0100
commitc1be0d907fb57480421d7b684e0f1c4f10b65daa (patch)
tree8524859223406b051b755586ca82ba2c4936134d /lockme.h
parent48493306d27a1e2f7750228a37c32e892ffbb310 (diff)
flowtop: Add header line with tool name & version
Add header bar to be symmetric to the footer. Signed-off-by: Vadim Kochan <vadim4j@gmail.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'lockme.h')
0 files changed, 0 insertions, 0 deletions
e>
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')