Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Sep 2015 02:11:50 +0000 (19:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Sep 2015 02:11:50 +0000 (19:11 -0700)
commite10994ff38ded64e4cd2267a6e404a4c8632bcf5
treed930979f3df479a2a913d810bbef016bb145bf16
parent5757bd6157f523ff0d448a4ec93938523ca441a9
parent33fef662d20a8a98bafa6b2430b845def30f616a
Merge branch 'locking-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull liblockdep fixes from Ingo Molnar:
 "Three liblockdep fixes left over from the v4.2 cycle"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tools/liblockdep: Use the rbtree header provided by common tools headers
  tools/liblockdep: Correct macro for WARN
  tools: Restore export.h