not sure why vr wanst enabled
add command line for scheduler
rework some things for aroma
rework some things for aroma
add HYPER gov
Merge remote-tracking branch 'upstream/4.2' into cm-10.1

Conflicts:
	arch/arm/boot/compressed/piggy.xzkern
	arch/arm/configs/lizard_defconfig