linux_4_15: fix a partial version downgrade on staging merge
Michael Raskin 8 years ago a600b621 50a9d51a