diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-12 20:30:30 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-12 20:30:30 +0200 |
| commit | f720e7ea3a77cc9e88eb2b2bd762021646d6be52 (patch) | |
| tree | 0817a6c27a4b26d92eb00897a32f915f42ca1951 /arch/arm/mach-at91 | |
| parent | Merge branch 'for-linus-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | ARM: dma-mapping: fix incorrect freeing of atomic allocations (diff) | |
| download | linux-f720e7ea3a77cc9e88eb2b2bd762021646d6be52.tar.xz linux-f720e7ea3a77cc9e88eb2b2bd762021646d6be52.zip | |
Merge branch 'fixes-for-linus-for-3.6-rc2' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull three dma-mapping fixes from Marek Szyprowski.
* 'fixes-for-linus-for-3.6-rc2' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
ARM: dma-mapping: fix incorrect freeing of atomic allocations
ARM: dma-mapping: fix atomic allocation alignment
ARM: mm: fix MMU mapping of CMA regions
Diffstat (limited to 'arch/arm/mach-at91')
0 files changed, 0 insertions, 0 deletions