| commit | 90c453ca2214394eec602d98e6cb92d151908493 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Feb 22 09:57:16 2015 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Feb 22 09:57:16 2015 -0800 |
| tree | 336d27967f7b2143b4c9bc0ab798e323850babca | |
| parent | a135c717d5cdb311cff7661af4c17fef0562e590 [diff] | |
| parent | 23be7fdafa50c42b7aa6ebcf0c090dea09e2ef08 [diff] |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm Pull ARM fix from Russell King: "Just one fix this time around. __iommu_alloc_buffer() can cause a BUG() if dma_alloc_coherent() is called with either __GFP_DMA32 or __GFP_HIGHMEM set. The patch from Alexandre addresses this" * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: 8305/1: DMA: Fix kzalloc flags in __iommu_alloc_buffer()