]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Apr 2016 22:43:19 +0000 (15:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Apr 2016 22:43:19 +0000 (15:43 -0700)
Pull locking fixlet from Ingo Molnar:
 "Fixes a build warning on certain Kconfig combinations"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/lockdep: Fix print_collision() unused warning


Trivial merge