diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-02 11:00:49 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-02 11:00:49 -0800 |
| commit | 7c06abcb16e1a03270f70725d0c62e8cf818cf48 (patch) | |
| tree | cec880a217495307ceba8259f5f777ee94b0a36b /arch/powerpc/include/asm/kvm_book3s_asm.h | |
| parent | 9b17c16525552b247cb2d9bb8eeadc87950b36ff (diff) | |
| parent | b6328a6b7ba57fc84c38248f6f0e387e1170f1a8 (diff) | |
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 <olof@lixom.net>
Diffstat (limited to 'arch/powerpc/include/asm/kvm_book3s_asm.h')
0 files changed, 0 insertions, 0 deletions