diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-29 10:37:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-29 10:37:04 -0700 |
| commit | 6a3e3dbee62a8fcf13c349b141b3cedf35a65c41 (patch) | |
| tree | feb306790403c1eb203a310c83a6175fc0ba1189 /arch/arm/include/asm/memory.h | |
| parent | Merge git://git.infradead.org/users/willy/linux-nvme (diff) | |
| parent | iommu/amd: Fix wrong assumption in iommu-group specific code (diff) | |
| download | linux-dev-6a3e3dbee62a8fcf13c349b141b3cedf35a65c41.tar.xz linux-dev-6a3e3dbee62a8fcf13c349b141b3cedf35a65c41.zip | |
Merge tag 'iommu-fixes-v3.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU fixes from Joerg Roedel:
"Two small patches:
* One patch to fix the function declarations for
!CONFIG_IOMMU_API. This is causing build errors
in linux-next and should be fixed for v3.6.
* Another patch to fix an IOMMU group related NULL pointer
dereference."
* tag 'iommu-fixes-v3.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/amd: Fix wrong assumption in iommu-group specific code
iommu: static inline iommu group stub functions
Diffstat (limited to 'arch/arm/include/asm/memory.h')
0 files changed, 0 insertions, 0 deletions