diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-12 22:30:30 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-12 22:30:30 +0400 |
| commit | f720e7ea3a77cc9e88eb2b2bd762021646d6be52 (patch) | |
| tree | 0817a6c27a4b26d92eb00897a32f915f42ca1951 /fs/btrfs | |
| parent | 15fc5deb1f3e9f6e42213ab1bbb0a463e5366c9c (diff) | |
| parent | d9e0d149b5dcc2ef4688afc572b9906bcda941ef (diff) | |
| download | linux-f720e7ea3a77cc9e88eb2b2bd762021646d6be52.tar.xz | |
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 'fs/btrfs')
0 files changed, 0 insertions, 0 deletions