Merge branch 'cm-10.1' of git://github.com/alfrix/android_kernel_samsung_latona into cm-10.1

Signed-off-by: David Rodero <david@codiguiel.net>

Conflicts:
	arch/arm/configs/latona_defconfig
	block/Makefile
	block/sio-iosched.c
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	drivers/cpufreq/cpufreq_smartass2.c
Input: atmel_mxt_ts - add calibrate sysfs entry

In some situations, a touch surface may get out of calibration.
It is useful to provide a means for userspace to trigger a recal, so add a
calibrate sysfs entry.

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: David Rodero <david@codiguiel.net>
input: atmel_mxt_ts - send a calibration command on system resume

Signed-off-by: David Rodero <david@codiguiel.net>
Merge branch 'cm-10.1' of git://github.com/dhiru1602/android_kernel_samsung_latona into cm-10.1

Signed-off-by: David Rodero <david@codiguiel.net>

Conflicts:
	arch/arm/mach-omap2/board-latona-power.c
	drivers/input/touchscreen/atmel_mxt_ts.c