Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: sched: bump version of kernel/sched_debug.c sched: fix minimum granularity tunings sched: fix RLIMIT_CPU comment sched: fix kernel/acct.c comment sched: fix prev_stime calculation sched: don't forget to unlock uids_mutex on error paths
Showing
- fs/proc/array.c 3 additions, 1 deletionfs/proc/array.c
- include/asm-generic/resource.h 1 addition, 1 deletioninclude/asm-generic/resource.h
- kernel/acct.c 1 addition, 1 deletionkernel/acct.c
- kernel/sched_debug.c 1 addition, 1 deletionkernel/sched_debug.c
- kernel/sched_fair.c 6 additions, 6 deletionskernel/sched_fair.c
- kernel/user.c 6 additions, 1 deletionkernel/user.c
Loading
Please register or sign in to comment