Upstream patches for kernel 3.0.101 compatibility