From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Mar 2011 00:52:22 +0000 (-0700)
Subject: Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=94df491c4a01b39d81279a68386158eb02656712;p=deliverable%2Flinux.git

Merge branch 'core-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  futex: Fix WARN_ON() test for UP
  WARN_ON_SMP(): Allow use in if() statements on UP
  x86, dumpstack: Use %pB format specifier for stack trace
  vsprintf: Introduce %pB format specifier
  lockdep: Remove unused 'factor' variable from lockdep_stats_show()
---

94df491c4a01b39d81279a68386158eb02656712