diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2017-08-23 14:47:51 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2017-08-23 14:48:05 +0100 |
| commit | 41921c54b898292b0140d5f322cc8ec5b0642a7e (patch) | |
| tree | 70c62f3b26536abf0fa4b347300c78360d4ff546 /lib/librte_eal/common/include/arch/ppc_64/rte_io.h | |
| parent | 76f89ef557ff345dfa606e797e1765404babce56 (diff) | |
| parent | f239aed5e674965691846e8ce3f187dd47523689 (diff) | |
Merge branch 'upstream' into HEAD
Change-Id: Ib9772cbbc33c14a44bd918056b22602ff6891a18
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'lib/librte_eal/common/include/arch/ppc_64/rte_io.h')
| -rw-r--r-- | lib/librte_eal/common/include/arch/ppc_64/rte_io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/librte_eal/common/include/arch/ppc_64/rte_io.h b/lib/librte_eal/common/include/arch/ppc_64/rte_io.h index be192da7..1f42ced5 100644 --- a/lib/librte_eal/common/include/arch/ppc_64/rte_io.h +++ b/lib/librte_eal/common/include/arch/ppc_64/rte_io.h @@ -1,7 +1,7 @@ /* * BSD LICENSE * - * Copyright(c) 2016 Cavium networks. All rights reserved. + * Copyright(c) 2016 Cavium, Inc. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Cavium networks nor the names of its + * * Neither the name of Cavium, Inc nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * |