Merge branch 'sched/urgent' into sched/core, to merge fixes before applying new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc fs/gfs2/glock.c
Simple merge

diff --cc fs/gfs2/lock_dlm.c
Simple merge

diff --cc fs/nfs/internal.h
Simple merge

diff --cc fs/nfs/pagelist.c
Simple merge

diff --cc fs/nfs/write.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sched/core.c
Simple merge