summaryrefslogtreecommitdiffstats
path: root/drivers/video/matrox
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-19 18:06:49 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-19 18:06:49 +0200
commitb3ea36b7a242773d7a05cec6c071a47b6581c178 (patch)
tree53edfe621b34f30b6f5212f4479d21e2c68dc743 /drivers/video/matrox
parentMerge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff)
parentkprobes/x86: Fix the return address of multiple kretprobes (diff)
downloadlinux-b3ea36b7a242773d7a05cec6c071a47b6581c178.tar.xz
linux-b3ea36b7a242773d7a05cec6c071a47b6581c178.zip
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: kprobes/x86: Fix the return address of multiple kretprobes perf tools: Fix build error on read only source. perf, x86: Fix Intel-nhm PMU programming errata workaround
Diffstat (limited to 'drivers/video/matrox')
0 files changed, 0 insertions, 0 deletions