summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-17 23:26:35 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-17 23:26:35 +0100
commit8ce9a75a307e142a8871c649627555e0e4a1eefb (patch)
treeba4ef31238311bd1089507b7a27c6802488fc9db /arch/x86/kernel
parentMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff)
parentiommu: fix Intel IOMMU write-buffer flushing (diff)
downloadlinux-8ce9a75a307e142a8871c649627555e0e4a1eefb.tar.xz
linux-8ce9a75a307e142a8871c649627555e0e4a1eefb.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: iommu: fix Intel IOMMU write-buffer flushing futex: fix reference leak Trivial conflicts fixed manually in drivers/pci/intel-iommu.c
Diffstat (limited to 'arch/x86/kernel')
0 files changed, 0 insertions, 0 deletions