Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: remove sched-design.txt from 00-INDEX
sched: change sched_debug's mode to 0444

+1 -3
-2
Documentation/scheduler/00-INDEX
··· 4 4 - CPU Scheduler implementation hints for architecture specific code. 5 5 sched-coding.txt 6 6 - reference for various scheduler-related methods in the O(1) scheduler. 7 - sched-design.txt 8 - - goals, design and implementation of the Linux O(1) scheduler. 9 7 sched-design-CFS.txt 10 8 - goals, design and implementation of the Complete Fair Scheduler. 11 9 sched-domains.txt
+1 -1
kernel/sched_debug.c
··· 319 319 { 320 320 struct proc_dir_entry *pe; 321 321 322 - pe = proc_create("sched_debug", 0644, NULL, &sched_debug_fops); 322 + pe = proc_create("sched_debug", 0444, NULL, &sched_debug_fops); 323 323 if (!pe) 324 324 return -ENOMEM; 325 325 return 0;