Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-rt