Merge the crypto tree to resolve conflict in qat Makefile.
Attach a file by drag & drop or click to upload
