| commit | 94df491c4a01b39d81279a68386158eb02656712 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 25 17:52:22 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 25 17:52:22 2011 -0700 |
| tree | ba431d9d74f11a7117883df54908ea39e4ef7c5c | |
| parent | 26ff6801f751cd47e44c2e9507ec08b447f2d2b9 [diff] | |
| parent | 29096202176ceaa5016a17ea2dd1aea19a4e90e2 [diff] |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/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()