Merge remote-tracking branch 'wireless-drivers/master'