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