Merge remote-tracking branch 'cm/cm-10.1' into db42

Conflicts:
	fs/ecryptfs/keystore.c
enable CPU OC by default