diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2019-12-19 13:25:07 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-19 13:25:07 -0300 |
| commit | 1d832e20c24583e665fc1731785177bb55b62c46 (patch) | |
| tree | 28487066573424d80d3df4f9ad3995c4f785ff1d /arch/arm/configs/apalis_imx6_defconfig | |
| parent | fa8a03bec68d9ef89da72277bd3501ed3daa6217 (diff) | |
| parent | 7174752387f200474c32a38c8ee7184d2744d426 (diff) | |
Merge pull request #56 from toradex/4.14-2.0.x-imx
crypto: mxs-dcp: remove merge conflict markers
Diffstat (limited to 'arch/arm/configs/apalis_imx6_defconfig')
0 files changed, 0 insertions, 0 deletions