| commit | 047bf3c24c4e76424fc3a3a0979ad262afcac61d | [log] [tgz] |
|---|---|---|
| author | Geert Uytterhoeven <geert+renesas@glider.be> | Tue Apr 18 11:12:41 2017 +0200 |
| committer | Geert Uytterhoeven <geert+renesas@glider.be> | Tue Apr 18 11:12:41 2017 +0200 |
| tree | 6c6f3cf7529d117de97e908386c32a991649e212 | |
| parent | 17db56860c00d715e0ce8c85c2e672f6e019f51a [diff] | |
| parent | f184821454313672e79c5e71a8450a09727e19e7 [diff] |
Merge branch 'topic/dma-attr-force-contiguous-v5' into renesas-drivers Conflicts: arch/arm64/boot/dts/renesas/r8a7796.dtsi