summaryrefslogtreecommitdiff
path: root/geoip.conf
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2015-04-27 18:21:28 +0200
committerTobias Klauser <tklauser@distanz.ch>2015-04-27 18:21:28 +0200
commit38fbb82405aa00315bb3a5e380ea34a28f5b9de7 (patch)
treeb48804d073aee4b829f67a8825dc3acb5fc1a3ff /geoip.conf
parent613be40b15d8e645a188a003b2b125b2e3aced8b (diff)
netsniff-ng: nlmsg: Rename function and dissector field
Netlink messages don't use the term `family' instead of `protocol', so stick to it when printing dissected information. Also, functions with the `nl_' prefix are used by libnl, so in order to not confuse it with libnl functions, rename nl_proto2str() to nlmsg_family2str() Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'geoip.conf')
0 files changed, 0 insertions, 0 deletions
/commit/drivers/usb/host/xhci-mem.c?h=nds-private-remove&id=206c4720092d2a24bfefc041b377e889a220ffbf'>206c4720092d2a24bfefc041b377e889a220ffbf (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/host/xhci-mem.c')