Merge several drivers with upstream kernel for cm-11.0 compatibility