Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Jun 2015 00:03:11 +0000 (14:03 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Jun 2015 00:03:11 +0000 (14:03 -1000)
Pull lockdep fix from Ingo Molnar:
 "A lockdep/modules unload race fix that can oops"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  lockdep: Fix a race between /proc/lock_stat and module unload


Trivial merge