diff options
| author | James Morris <jmorris@namei.org> | 2008-12-04 01:16:36 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-04 01:16:36 -0500 |
| commit | ec98ce480ada787f2cfbd696980ff3564415505b (patch) | |
| tree | 1a4d644b38f9f1e4b4e086fde0b195df4a92cf84 /init | |
| parent | 3496f92beb9aa99ef21fccc154a36c7698e9c538 (diff) | |
| parent | feaf3848a813a106f163013af6fcf6c4bfec92d9 (diff) | |
Merge branch 'master' into next
Conflicts:
fs/nfsd/nfs4recover.c
Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 226da2733c1e..f763762d544a 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -354,7 +354,7 @@ config RT_GROUP_SCHED | |||
| 354 | setting below. If enabled, it will also make it impossible to | 354 | setting below. If enabled, it will also make it impossible to |
| 355 | schedule realtime tasks for non-root users until you allocate | 355 | schedule realtime tasks for non-root users until you allocate |
| 356 | realtime bandwidth for them. | 356 | realtime bandwidth for them. |
| 357 | See Documentation/sched-rt-group.txt for more information. | 357 | See Documentation/scheduler/sched-rt-group.txt for more information. |
| 358 | 358 | ||
| 359 | choice | 359 | choice |
| 360 | depends on GROUP_SCHED | 360 | depends on GROUP_SCHED |