commit | 8ce9a75a307e142a8871c649627555e0e4a1eefb | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 17 14:26:35 2009 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 17 14:26:35 2009 -0800 |
tree | ba4ef31238311bd1089507b7a27c6802488fc9db | |
parent | b30b77493039b7b95b4d569a66af425b02651edd [diff] | |
parent | 9af88143b277f52fc6ce0d69137f435c73c39c1a [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: iommu: fix Intel IOMMU write-buffer flushing futex: fix reference leak Trivial conflicts fixed manually in drivers/pci/intel-iommu.c