b92bd5
Merge remote-tracking branch 'origin/users/nborisov/SLE12-SP5_EMBARGO/bsc1213456' into SLE12-SP5_EMBARGO Conflicts: patches.kabi/cpufeatures-kabi-fix.patch