projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
kernel
/
utsname.c
diff --git
a/kernel/utsname.c
b/kernel/utsname.c
index
a47fc5d
..
2fc8576
100644
(file)
--- a/
kernel/utsname.c
+++ b/
kernel/utsname.c
@@
-15,7
+15,7
@@
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/user_namespace.h>
-#include <linux/proc_
f
s.h>
+#include <linux/proc_
n
s.h>
static struct uts_namespace *create_uts_ns(void)
{