diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 17:26:35 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 17:26:35 -0500 |
| commit | 8ce9a75a307e142a8871c649627555e0e4a1eefb (patch) | |
| tree | ba4ef31238311bd1089507b7a27c6802488fc9db /fs/ocfs2/sysfile.h | |
| 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
Diffstat (limited to 'fs/ocfs2/sysfile.h')
0 files changed, 0 insertions, 0 deletions