From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Jul 2008 21:55:13 +0000 (-0700)
Subject: Merge branch 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/tip... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=40e7babbb52b4b57721b9175aed7a14d93bf242f;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'core/locking' of git://git./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
---

40e7babbb52b4b57721b9175aed7a14d93bf242f