Merge branch 'for-linus' of git://dev.laptop.org/users/cjb/mmc