From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Feb 2009 22:26:35 +0000 (-0800)
Subject: Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8ce9a75a307e142a8871c649627555e0e4a1eefb;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

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
---

8ce9a75a307e142a8871c649627555e0e4a1eefb