Initial changes for 3.0 kernel