Merge branch 'sched/urgent' into sched/core, to merge fixes before applying new changes
authorIngo Molnar <mingo@kernel.org>
Mon, 28 Jul 2014 08:03:00 +0000 (10:03 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 28 Jul 2014 08:03:00 +0000 (10:03 +0200)
commitca5bc6cd5de5b53eb8fd6fea39aa3fe2a1e8c3d9
tree75beaae2d4b6bc654eb28994dd5906d8dcf5ef46
parentc1221321b7c25b53204447cff9949a6d5a7ddddc
parentd8d28c8f00e84a72e8bee39a85835635417bee49
Merge branch 'sched/urgent' into sched/core, to merge fixes before applying new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
fs/gfs2/glock.c
fs/gfs2/lock_dlm.c
fs/nfs/internal.h
fs/nfs/pagelist.c
fs/nfs/write.c
include/linux/sched.h
kernel/sched/core.c