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 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[pandora-kernel.git]
/
arch
/
x86
/
configs
/
i386_defconfig
diff --git
a/arch/x86/configs/i386_defconfig
b/arch/x86/configs/i386_defconfig
index
6f98726
..
2bf1805
100644
(file)
--- a/
arch/x86/configs/i386_defconfig
+++ b/
arch/x86/configs/i386_defconfig
@@
-10,7
+10,6
@@
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_AUDIT=y
CONFIG_LOG_BUF_SHIFT=18
CONFIG_CGROUPS=y
-CONFIG_CGROUP_NS=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y