merge in 3.0 kernel changes