Upstream to Linux kernel 3.0.93