Remove unneed
inital 4.2 with new kernel(caf jb 2.5)
Merge remote-tracking branch 'upstream/cm-10.1' into AOKP

Conflicts:
	cm.mk

Sync To Upstream for new kernel