From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Jan 2014 08:54:49 +0000 (+0700)
Subject: Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: firefly_0821_release~176^2~4691
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2aa63ce00064f02613efb08c31d3664df421d8d8;p=firefly-linux-kernel-4.4.55.git

Merge tag 'fixes-for-linus' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "A few fixes for Renesas platforms to fixup DMA masks (this started
  causing errors once the DMA API added checks for valid masks in 3.13)"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: shmobile: mackerel: Fix coherent DMA mask
  ARM: shmobile: kzm9g: Fix coherent DMA mask
  ARM: shmobile: armadillo: Fix coherent DMA mask
---

2aa63ce00064f02613efb08c31d3664df421d8d8