summaryrefslogtreecommitdiff
path: root/ipv6.h
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2015-05-05 12:00:48 +0200
committerTobias Klauser <tklauser@distanz.ch>2015-05-05 12:00:48 +0200
commit67e0574edb3c6919382ff96da1bcd800f9bfe45e (patch)
treee2ca93c127b5d06b9db61b4de7da95cad2a0feee /ipv6.h
parent0757f825dd4b0e3653a98264bbe3933d54b3c1ef (diff)
docs: authors: Move Vadim to major contributors
Vadim has contributed numerous improvements and bug fixes for netsniff-ng and hopefully continues to do so. Move him to the major contributors section in the AUTHORS file. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'ipv6.h')
0 files changed, 0 insertions, 0 deletions
fb837e93b517036fab4500fe39de5&id2=93362fa47fe98b62e4a34ab408c4a418432e7939'>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 'net/nfc/llcp.h')