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

Conflicts:
	kernel/events/core.c

Change-Id: I2a218e9d099fe8787af5bca99a26a98480ff517f