tree e16bc0a698c891922ca4c0166e0e08ac194718ed
parent 948769a5ba304ed3329a2f42ee3561f04a0b5692
parent d12c1a37925a8ec386994169605fe99217295199
author Linus Torvalds <torvalds@linux-foundation.org> 1216072513 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1216072513 -0700

Merge branch 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: fix kernel/fork.c warning
  lockdep: fix ftrace irq tracing false positive
  lockdep: remove duplicate definition of STATIC_LOCKDEP_MAP_INIT
  lockdep: add lock_class information to lock_chain and output it
  lockdep: add lock_class information to lock_chain and output it
  lockdep: output lock_class key instead of address for forward dependency output
  __mutex_lock_common: use signal_pending_state()
  mutex-debug: check mutex magic before owner

Fixed up conflict in kernel/fork.c manually