Merge branch 'kk_3.5_rb4' of /home/shade/codeaurora/kernel into fbn

Change-Id: Ieff730bdca0ca844507f17e13e3f84f6ba9d1590