Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixes