Merge tag 'v4.1.36' into linux-linaro-lsk-v4.1

 This is the 4.1.36 stable release