Squashed commit of the upstream kernel changes

This brings our kernel in sync with cdesai's work on CM,
primarily merging in CAF kk_2.7

I removed the commit messages from this commit message as there
were just way too damn many...

Change-Id: Ie2b98576c2032cc18678738cf8cc92cd7afae688