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

Conflicts:
	kernel/events/core.c

Change-Id: Ib5962568abc22408a5e4f463ee64d700e1db1b35