Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Apr 2016 02:59:17 +0000 (19:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Apr 2016 02:59:17 +0000 (19:59 -0700)
commit2113caed87dd372e5ca2d9b3cba415f4da38936b
treea8ce1b6b1653323e11d7152f2900f66bbd4bdca4
parent8f3603a210970d665e7cecf6623331ce6b24f713
parent75dd602a5198a6e5f75534db52b6e6fbaabb33d1
Merge branch 'locking-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull locking fixes from Ingo Molnar:
 "Two lockdep fixes"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  lockdep: Fix lock_chain::base size
  locking/lockdep: Fix ->irq_context calculation