Merge branch 'core/locking' into tracing/ftrace

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/sparc/kernel/irq_64.c
Simple merge

diff --cc arch/x86/mm/pageattr.c
Simple merge

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

diff --cc init/Kconfig
Simple merge

diff --cc kernel/lockdep.c
Simple merge

diff --cc kernel/softirq.c
Simple merge