diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2011-09-06 14:59:21 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2011-09-06 14:59:21 +0200 |
| commit | 51acc0bcfc91987ed38195918e0b40ff05197585 (patch) | |
| tree | 04bd7bbd5cfe925600db035e41d6050cee38b139 /arch/um/Kconfig.x86 | |
| parent | dma-debug: hash_bucket_find needs to allow for offsets within an entry (diff) | |
| parent | iommu/omap: ->unmap() should return order of unmapped page (diff) | |
| parent | iommu/msm: ->unmap() should return order of unmapped page (diff) | |
| parent | iommu/core: Use PAGE_SIZE instead of hard-coded value (diff) | |
| download | linux-51acc0bcfc91987ed38195918e0b40ff05197585.tar.xz linux-51acc0bcfc91987ed38195918e0b40ff05197585.zip | |
Merge branches 'debug/dma-api', 'arm/omap', 'arm/msm' and 'core' into api-2