summaryrefslogtreecommitdiff
path: root/geoip.c
diff options
context:
space:
mode:
authorHisao Tanabe <xtanabe@gmail.com>2016-06-22 01:20:35 +0900
committerTobias Klauser <tklauser@distanz.ch>2016-06-22 09:28:13 +0200
commitb0230ce4b1cdfce252a6a04873098f911af5e104 (patch)
treeeff8a21e33e208fb36dc0471ad86ec2ef04f4647 /geoip.c
parent4bf0e7f3cf5d376747b3888a19c676655ff3ce39 (diff)
man: netsniff-ng: Fix usage example description
Fix the input device name that is used in the description of the usage example. Signed-off-by: Hisao Tanabe <xtanabe@gmail.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'geoip.c')
0 files changed, 0 insertions, 0 deletions
rom Andrew)
Merge updates from Andrew Morton: - various misc bits - most of MM (quite a lot of MM material is awaiting the merge of linux-next dependencies) - kasan - printk updates - procfs updates - MAINTAINERS - /lib updates - checkpatch updates * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (123 commits) init: reduce rootwait polling interval time to 5ms binfmt_elf: use vmalloc() for allocation of vma_filesz checkpatch: don't emit unified-diff error for rename-only patches checkpatch: don't check c99 types like uint8_t under tools checkpatch: avoid multiple line dereferences checkpatch: don't check .pl files, improve absolute path commit log test scripts/checkpatch.pl: fix spelling checkpatch: don't try to get maintained status when --no-tree is given lib/ida: document locking requirements a bit better lib/rbtree.c: fix typo in comment of ____rb_erase_color lib/Kconfig.debug: make CONFIG_STRICT_DEVMEM depend on CONFIG_DEVMEM MAINTAINERS: add drm and drm/i915 irc channels MAINTAINERS: add "C:" for URI for chat where developers hang out MAINTAINERS: add drm and drm/i915 bug filing info MAINTAINERS: add "B:" for URI where to file bugs get_maintainer: look for arbitrary letter prefixes in sections printk: add Kconfig option to set default console loglevel printk/sound: handle more message headers printk/btrfs: handle more message headers printk/kdb: handle more message headers ...
Diffstat (limited to 'arch/ia64/kernel/entry.S')