Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2009 22:26:35 +0000 (14:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2009 22:26:35 +0000 (14:26 -0800)
commit8ce9a75a307e142a8871c649627555e0e4a1eefb
treeba4ef31238311bd1089507b7a27c6802488fc9db
parentb30b77493039b7b95b4d569a66af425b02651edd
parent9af88143b277f52fc6ce0d69137f435c73c39c1a
Merge branch 'core-fixes-for-linus' of git://git./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