Merge branch 'master' into ti

This commit is contained in:
toddouska 2014-05-20 17:18:31 -07:00
commit 6eeba7f50c

View File

@ -24,7 +24,7 @@
; *by Israel,Intel Mobility Group Development Center,Israel Shay Gueron ; *by Israel,Intel Mobility Group Development Center,Israel Shay Gueron
; */ ; */
; ;
; /* This file is in intel sm syntax, see .s for intel syntax */ ; /* This file is in intel asm syntax, see .s for at&t syntax */
; ;
; /* ; /*
; AES_CBC_encrypt[const ,unsigned char*in ; AES_CBC_encrypt[const ,unsigned char*in