Merge tag 'v3.10.40' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into imx_3.10.stable-udoo

This is the 3.10.40 stable release