| commit | f720e7ea3a77cc9e88eb2b2bd762021646d6be52 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Aug 12 21:30:30 2012 +0300 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Aug 12 21:30:30 2012 +0300 |
| tree | 0817a6c27a4b26d92eb00897a32f915f42ca1951 | |
| parent | 15fc5deb1f3e9f6e42213ab1bbb0a463e5366c9c [diff] | |
| parent | d9e0d149b5dcc2ef4688afc572b9906bcda941ef [diff] |
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