diff options
author | Jens Rehsack <sno@netbsd.org> | 2020-07-09 17:26:37 +0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2020-07-09 13:33:26 -0300 |
commit | 901b192ff8652236607f423386aee496e3ae2730 (patch) | |
tree | 9c15a3ed5c37b974d6484f051ce57c29c3c20ab2 /dynamic-layers/virtualization-layer | |
parent | 0f3947982905745f053c72ea9aa678b1737c468a (diff) | |
download | meta-freescale-901b192ff8652236607f423386aee496e3ae2730.tar.gz |
linux-fslc-qoriq: fix merge error
Fix merge error introduced while fixing conflict merging 5.4.48:
d1a00c9bb1c7 dpaa2-eth: fix return codes used in ndo_setup_tc
Signed-off-by: Jens Rehsack <sno@netbsd.org>
Diffstat (limited to 'dynamic-layers/virtualization-layer')
0 files changed, 0 insertions, 0 deletions