Merge tag 'v3.0.31' of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable into stable-android-ux500-3.0

This is the 3.0.31 stable release