From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Feb 2015 17:57:16 +0000 (-0800)
Subject: Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
X-Git-Tag: v4.0-rc1~3
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=90c453ca2214394eec602d98e6cb92d151908493;p=cascardo%2Flinux.git

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()
---

90c453ca2214394eec602d98e6cb92d151908493