summaryrefslogtreecommitdiff
path: root/curvetun/Makefile
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 /curvetun/Makefile
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 'curvetun/Makefile')
0 files changed, 0 insertions, 0 deletions
b62e4a34ab408c4a418432e7939'>diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull namespace fixes from Eric Biederman: "This tree contains 4 fixes. The first is a fix for a race that can causes oopses under the right circumstances, and that someone just recently encountered. Past that are several small trivial correct fixes. A real issue that was blocking development of an out of tree driver, but does not appear to have caused any actual problems for in-tree code. A potential deadlock that was reported by lockdep. And a deadlock people have experienced and took the time to track down caused by a cleanup that removed the code to drop a reference count" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: sysctl: Drop reference added by grab_header in proc_sys_readdir pid: fix lockdep deadlock warning due to ucount_lock libfs: Modify mount_pseudo_xattr to be clear it is not a userspace mount mnt: Protect the mountpoint hashtable with mount_lock
Diffstat (limited to 'include/trace/events/mmc.h')