Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_kernel_samsung_jf into cm-10.1

Signed-off-by: task650 <task650@gmail.com>

Conflicts:
	include/linux/freezer.h