diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-12-19 16:31:22 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-12-19 16:31:22 +0100 |
| commit | 7174752387f200474c32a38c8ee7184d2744d426 (patch) | |
| tree | 28487066573424d80d3df4f9ad3995c4f785ff1d /arch/arm/configs/apalis_imx6_defconfig | |
| parent | fa8a03bec68d9ef89da72277bd3501ed3daa6217 (diff) | |
crypto: mxs-dcp: remove merge conflict markers
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'arch/arm/configs/apalis_imx6_defconfig')
0 files changed, 0 insertions, 0 deletions