baihuahua/linux — pull request #2 by baihuahua (2014-05-24 08:35:59+00:00)
Title: merge upstream

merge upstream#2