Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches a222d6dbd8 update to latest upstream version, enable for arm 13 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu