summaryrefslogtreecommitdiffstats
path: root/drivers/video/tdfxfb.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-26 01:52:22 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-26 01:52:22 +0100
commit94df491c4a01b39d81279a68386158eb02656712 (patch)
treeba431d9d74f11a7117883df54908ea39e4ef7c5c /drivers/video/tdfxfb.c
parentMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentfutex: Fix WARN_ON() test for UP (diff)
downloadlinux-94df491c4a01b39d81279a68386158eb02656712.tar.xz
linux-94df491c4a01b39d81279a68386158eb02656712.zip
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()
Diffstat (limited to 'drivers/video/tdfxfb.c')
0 files changed, 0 insertions, 0 deletions