Upstream to 3.0.32

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

Change-Id: I6fa863aec81971a336955ff07905364a18f62aba