Missed some copyright merge
authorRich Salz <rsalz@openssl.org>
Mon, 13 Jun 2016 18:59:57 +0000 (14:59 -0400)
committerRich Salz <rsalz@openssl.org>
Mon, 13 Jun 2016 20:05:25 +0000 (16:05 -0400)
commit96d06c213d5a2c1af42dd3b5d7bcc4a65df90738
tree3dbaef15b122ca6378ab8daf1404c75252af28ec
parentbbaa9dd850152bc85cad094e0aa0c685553d149c
Missed some copyright merge

Reviewed-by: Tim Hudson <tjh@openssl.org>
crypto/camellia/camellia.c
crypto/camellia/cmll_locl.h