| commit | 101041cf2619b397b0fa7e2ab544607026d59314 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 15 Nov 2011 16:56:56 +0000 (15 14:56 -0200) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 15 Nov 2011 16:56:56 +0000 (15 14:56 -0200) | ||
| tree | e214e297b3e52c0156fbca5a97056ee2a1829e8f | treesnapshot (tar.gz zip) |
| parent | 5870b2c719b15cfe3f2de3e8be51bc6e17c67e7a | commitdiff |
| parent | 08f2e6312c67fed80df9342e06ad36daf11eb80b | commitdiff |
Merge branch 'iommu/fixes' of git://git./linux/kernel/git/joro/iommu
* 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu: omap: Fix compile failure
* 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu: omap: Fix compile failure