Bring from linux-3.0-jb