Merge branch 'locking/urgent' into locking/core, to pick up fixes

Signed-off-by: Ingo Molnar <[email protected]>

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

diff --cc kernel/locking/lockdep.c
Simple merge

diff --cc mm/swap.c
Simple merge

diff --cc scripts/tags.sh
Simple merge