diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:26:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:26:35 -0800 |
| commit | 8ce9a75a307e142a8871c649627555e0e4a1eefb (patch) | |
| tree | ba4ef31238311bd1089507b7a27c6802488fc9db /mm/mlock.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
| parent | iommu: fix Intel IOMMU write-buffer flushing (diff) | |
| download | linux-dev-8ce9a75a307e142a8871c649627555e0e4a1eefb.tar.xz linux-dev-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 'mm/mlock.c')
0 files changed, 0 insertions, 0 deletions