Merge branch 'fix' of git://github.com/ycmiao/pxa-linux into fixes