Merge "target: msmtitanium: fix incorrect scratch address" into lk.lnx.1.0-dev.1.0