git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a135c71 23be7fd)
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Feb 2015 17:57:16 +0000 (09:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Feb 2015 17:57:16 +0000 (09:57 -0800)
commit90c453ca2214394eec602d98e6cb92d151908493
tree336d27967f7b2143b4c9bc0ab798e323850babcatree
parenta135c717d5cdb311cff7661af4c17fef0562e590commit | diff
parent23be7fdafa50c42b7aa6ebcf0c090dea09e2ef08commit | 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()
arch/arm/mm/dma-mapping.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.