diff options
| author | Frieder Schrempf <[email protected]> | 2023-02-08 17:20:33 +0100 |
|---|---|---|
| committer | Stefano Babic <[email protected]> | 2023-03-30 08:40:27 +0200 |
| commit | db869a278526020779cf1c855c353e92ba31733c (patch) | |
| tree | 267bc8fa0e044c294c21ca1b3aa354de1ff1e0ce /include/linux | |
| parent | 7e32871ce4d17aa549d44f0e50434b5c6454d184 (diff) | |
doc: sl-mx8mm: Fix mistake in merge conflict resolution
There was a conflict between the following two commits, that wasn't
resolved correctly. Fix this.
a93985ddfcc3 ("doc: sl-mx8mm: Update the NXP TF-A source reference")
f0f461287eff ("imx: Suggest the NXP ATF github repo")
Signed-off-by: Frieder Schrempf <[email protected]>
Cc: Heinrich Schuchardt <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Stefano Babic <[email protected]>
Reviewed-by: Fabio Estevam <[email protected]>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions