Merge branch 'cm-11.0' of git://github.com/dhiru1602/android_kernel_samsung_latona into cm-11.0

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

Conflicts:
	arch/arm/mach-omap2/opp3xxx_data.c

Change-Id: I43541e432dc613b99440c4c49cd4ee35a705dddd
Merge branch 'cm-11.0' into latona-3.0.y