projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
[cascardo/linux.git]
/
net
/
Kconfig
diff --git
a/net/Kconfig
b/net/Kconfig
index
d1f6f96
..
d92afe4
100644
(file)
--- a/
net/Kconfig
+++ b/
net/Kconfig
@@
-243,7
+243,7
@@
config XPS
default y
config CGROUP_NET_PRIO
-
tristate
"Network priority cgroup"
+
bool
"Network priority cgroup"
depends on CGROUPS
---help---
Cgroup subsystem for use in assigning processes to network priorities on