brcm80211fwconv: Fix sorting for merge