Bring in drivers from 3.0 kernel