diff options
| author | Linus Torvalds | 2013-07-06 21:41:54 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2013-07-06 21:41:54 +0200 |
| commit | 8b70a90cabafb6a6e1a0d3f838b38355fe48337e (patch) | |
| tree | 1234fd99081958a6d8ca1a8d8bfad7662106749c /init/main.c | |
| parent | Merge tag 'metag-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | ARM: dma: Drop __GFP_COMP for iommu dma memory allocations (diff) | |
| download | kernel-qcow2-linux-8b70a90cabafb6a6e1a0d3f838b38355fe48337e.tar.gz kernel-qcow2-linux-8b70a90cabafb6a6e1a0d3f838b38355fe48337e.tar.xz kernel-qcow2-linux-8b70a90cabafb6a6e1a0d3f838b38355fe48337e.zip | |
Merge branch 'for-v3.11' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull ARM DMA mapping updates from Marek Szyprowski:
"This contains important bugfixes and an update for IOMMU integration
support for ARM architecture"
* 'for-v3.11' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
ARM: dma: Drop __GFP_COMP for iommu dma memory allocations
ARM: DMA-mapping: mark all !DMA_TO_DEVICE pages in unmapping as clean
ARM: dma-mapping: NULLify dev->archdata.mapping pointer on detach
ARM: dma-mapping: convert DMA direction into IOMMU protection attributes
ARM: dma-mapping: Get pages if the cpu_addr is out of atomic_pool
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions