summaryrefslogtreecommitdiff
path: root/ui.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2016-12-13 18:46:31 +0100
committerTobias Klauser <tklauser@distanz.ch>2016-12-13 18:46:31 +0100
commit57739dfaa8bd88160fadcb34cea543c832a3b265 (patch)
tree962f20ef147c075b3d715cc2a6565b1b2b3d7579 /ui.c
parent0a9adf482d5bb2cf27ede0f970228b9f69145f4d (diff)
zsh: trafgen: Add missing option -q/--qdisc-path to zsh completion
Also sightly adjust the description in the usage text. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'ui.c')
0 files changed, 0 insertions, 0 deletions
t-next.git/diff/tools/thermal/tmon/tui.c?h=nds-private-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 'tools/thermal/tmon/tui.c')