jb-3.0 > cm-10.1

3.0.x kernel is stable enough to use, merge specific changes in cm-10.1 branch