summaryrefslogtreecommitdiff
path: root/conntrack.h
diff options
context:
space:
mode:
authorVadim Kochan <vadim4j@gmail.com>2015-10-29 06:08:24 +0200
committerTobias Klauser <tklauser@distanz.ch>2015-10-29 09:27:31 +0100
commitf863bc21719c99d09e2db8cad3ac6ac19ab43ef5 (patch)
treeb85c707688ad2eeb9e64002ee050d5ed58b626bf /conntrack.h
parent1eba05919fed6a72612ebf918eb92847e59c63df (diff)
flowtop: Fix missing --no-geoip option in usage output
Add G,--no-geoip to the usage output. Signed-off-by: Vadim Kochan <vadim4j@gmail.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'conntrack.h')
0 files changed, 0 insertions, 0 deletions
p;id=3f67790d2b7e322bcf363ec717085dd78c3ea7cd&id2=cd44691f7177b2c1e1509d1a17d9b198ebaa34eb'>diff)parent206c4720092d2a24bfefc041b377e889a220ffbf (diff)
Merge tag 'regulator-fix-v4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown: "Three changes here: two run of the mill driver specific fixes and a change from Mark Rutland which reverts some new device specific ACPI binding code which was added during the merge window as there are concerns about this sending the wrong signal about usage of regulators in ACPI systems" * tag 'regulator-fix-v4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: fixed: Revert support for ACPI interface regulator: axp20x: AXP806: Fix dcdcb being set instead of dcdce regulator: twl6030: fix range comparison, allowing vsel = 59
Diffstat (limited to 'drivers/usb/misc/emi26.c')