From: Olof Johansson Date: Thu, 2 Jan 2014 19:00:49 +0000 (-0800) Subject: Merge tag 'renesas-fixes3-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7c06abcb16e1a03270f70725d0c62e8cf818cf48;p=linux-beck.git Merge tag 'renesas-fixes3-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes From Simon Horman: Third Round of Renesas ARM based SoC Fixes for v3.13 * sh7372 (SH-Mobile AP4) based Mackerel board r8a773a0 (SH-Mobile AG5) based kzm9g board r8a7740 (R-Mobile A1) based Armadillo board - Correct coherent DMA mask This resolves regressions introduced by 4dcfa60071b3d23f ("ARM: DMA-API: better handing of DMA masks for coherent allocations") in v3.12-rc1. * tag 'renesas-fixes3-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: mackerel: Fix coherent DMA mask ARM: shmobile: kzm9g: Fix coherent DMA mask ARM: shmobile: armadillo: Fix coherent DMA mask Signed-off-by: Olof Johansson --- 7c06abcb16e1a03270f70725d0c62e8cf818cf48