Merge cm10.2, fix typo in sound/hda_codec