summaryrefslogtreecommitdiff
path: root/flowtop/.gitignore
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-07-13 17:06:28 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-07-13 17:06:28 +0200
commit4f9ffe876b017756ef0c6b79a4608a069023671a (patch)
treedcc15f0d43d22dcb3fc38d98ba0956574604db1f /flowtop/.gitignore
parentae756495304072745fc6925951ae0d8d6fb65059 (diff)
oui-update.py: oui: minor config updates
There have been minor updates after letting the script run. Some are spelling fixes, some modified entries. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'flowtop/.gitignore')
0 files changed, 0 insertions, 0 deletions
mp;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 'include/acpi/reboot.h')