Merge branch 'for-linus/2635-updates' of git://git.fluff.org/bjdooks/linux