Upstream 3.0.41 -> 3.0.42

https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/log/?h=linux-3.0.y

Change-Id: Iddd4aae2cbe8ea27c910318aa853839387737af0