Merge branch 'kk_2.7_rb1.9' of git://codeaurora.org/quic/la/kernel/msm into cm-10.2

Conflicts:
	arch/arm/kernel/perf_event.c