diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 16:10:40 (GMT) |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 16:10:40 (GMT) |
commit | 57e33ff1dba139a70723e922c5838499610b60c1 (patch) | |
tree | e4009d05383590b9f9ee4f2b2a7a3e065f4fbb59 /arch/arm/include/debug | |
parent | a508698e6bbe38a3f34dd7e611931c0c8fabc213 (diff) | |
parent | 8237f9e5c38098aeb8570a77bacd0fe0ebc61dfa (diff) | |
download | linux-57e33ff1dba139a70723e922c5838499610b60c1.tar.xz |
Merge tag 'renesas-soc5-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Pull "Fifth Round of Renesas ARM Based SoC Soc Updates for v3.18" from Simon Horman:
* r8a7740: Fix documentation error copied from elsewhere
* r8a7794: Reserve memory for CMA in a manner consistent to
other R-Car Gen2 SoCs
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-soc5-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7740 legacy: Fix copied bug in comment
ARM: shmobile: r8a7794: Reserve memory as other R-Car Gen2 SoCs
Diffstat (limited to 'arch/arm/include/debug')
0 files changed, 0 insertions, 0 deletions