Merge branch 'kk_2.7-stable' of git://codeaurora.org/quic/la/kernel/msm into cm-11.0

Change-Id: I3b13f6e6ee72b104f85e59af0a6c39a596567b42
perf_trace_counters: Fix the build

Change-Id: Ie17ef66d95eda5e734b90f019231a3106e517242