Upstream to Linux-3.0.101