Merge remote-tracking branch 'codeaurora/caf/kk_2.7_rb1.41' into cm-11.0

Conflicts:
	kernel/events/core.c

Change-Id: I52dfe8b56924fb2d86bf1487eed6114342621603
msm: perf: Fix standalone compilation

Include perf_trace_counters header file in trace directory to
avoid compile errors when compiling standalone kernel image.

Change-Id: I4cb2928e37357eb6bf5f4118858f558dbe2f7f96
Fix build for GCC 4.7

Change-Id: I4e9265369174d82b55fd435bc47887972f99c9d4