Merge remote-tracking branch 'github/cm-10.1' into cm-10.2-merge

Conflicts:
	arch/arm/configs/cyanogenmod_grouper_defconfig

Change-Id: Ie8c48690e32a332ea3b767ca51bcc1acc319470e

Conflicts:
	arch/arm/configs/tegra_p1852_android_defconfig
	arch/arm/mach-tegra/board-grouper-panel.c