Upstream 3.0.39 -> 3.0.40

https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/log/?h=lin$

Change-Id: I302c701f691c14304725a3891de506e5acaa001a