Merge "cnss2: Use general name "wlan" as subsystem name"