Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (33 commits)
  lockdep: fix deadlock in lockdep_trace_alloc
  lockdep: annotate reclaim context (__GFP_NOFS), fix SLOB
  lockdep: annotate reclaim context (__GFP_NOFS), fix
  lockdep: build fix for !PROVE_LOCKING
  lockstat: warn about disabled lock debugging
  lockdep: use stringify.h
  lockdep: simplify check_prev_add_irq()
  lockdep: get_user_chars() redo
  lockdep: simplify get_user_chars()
  lockdep: add comments to mark_lock_irq()
  lockdep: remove macro usage from mark_held_locks()
  lockdep: fully reduce mark_lock_irq()
  lockdep: merge the !_READ mark_lock_irq() helpers
  lockdep: merge the _READ mark_lock_irq() helpers
  lockdep: simplify mark_lock_irq() helpers #3
  lockdep: further simplify mark_lock_irq() helpers
  lockdep: simplify the mark_lock_irq() helpers
  lockdep: split up mark_lock_irq()
  lockdep: generate usage strings
  lockdep: generate the state bit definitions
  ...

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

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

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/sched_features.h
Simple merge

diff --cc kernel/timer.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/slab.c
Simple merge

diff --cc mm/slob.c
Simple merge

diff --cc mm/slub.c
Simple merge

diff --cc mm/vmscan.c
Simple merge