git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
kernel
/
nsproxy.c
diff --git
a/kernel/nsproxy.c
b/kernel/nsproxy.c
index
10f0bbb
..
a4fb7d4
100644
(file)
--- a/
kernel/nsproxy.c
+++ b/
kernel/nsproxy.c
@@
-193,7
+193,7
@@
int unshare_nsproxy_namespaces(unsigned long unshare_flags,
static int __init nsproxy_cache_init(void)
{
nsproxy_cachep = kmem_cache_create("nsproxy", sizeof(struct nsproxy),
- 0, SLAB_PANIC, NULL
, NULL
);
+ 0, SLAB_PANIC, NULL);
return 0;
}