tree d60300a99b2a299c6a078c815ccbba8d9c35b389
parent 820e63e1e69b493368ccb083af7362f372c49ee4
parent cca9bc0e2b42c7351bf7fa4e37d8df1940393972
author Elliott Hughes <enh@google.com> 1463524111 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1463524111 +0000

Merge "scrypt doesn't need <machine/cpu-features.h>."