Merge tag 'v3.4.11' of git://codeaurora.org/quic/la/kernel/msm into cm-10.1-linaro

This is the 3.4.11 stable release
fix merge errors