Merge branch 'hash' of git://ftp.sciencehorizons.net/linux