This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".

The branch, api-next has been updated via 064cdece468e83bb72ef9ece63e8f0e05856eeb7 (commit) via 20f14c1e726c97cb675c26627c073b730bcb58e6 (commit) via d440fa6b463d9dad5e852d7970c5f77493f190f0 (commit) from 8fede35ce4e41dc8a5de3164be40e2e630cd0812 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 064cdece468e83bb72ef9ece63e8f0e05856eeb7 Merge: 8fede35 20f14c1 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Fri Jul 22 15:38:17 2016 +0300

Merge branch 'master' into api-next

Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

diff --cc platform/Makefile.inc index 404c798,a44f88f..079f34d --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@@ -61,12 -61,19 +61,29 @@@ odpapispecinclude_HEADERS = $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \ $(top_srcdir)/include/odp/api/spec/version.h

+odpdrvspecincludedir= $(includedir)/odp/drv/spec +odpdrvspecinclude_HEADERS = \ + $(top_srcdir)/include/odp/drv/spec/align.h \ + $(top_srcdir)/include/odp/drv/spec/atomic.h \ + $(top_srcdir)/include/odp/drv/spec/byteorder.h \ + $(top_srcdir)/include/odp/drv/spec/compiler.h \ + $(top_srcdir)/include/odp/drv/spec/spinlock.h \ + $(top_srcdir)/include/odp/drv/spec/std_types.h \ + $(top_srcdir)/include/odp/drv/spec/sync.h ++ + EXTRA_DIST = \ + arch/arm/odp/api/cpu_arch.h \ + arch/arm/odp_cpu_arch.c \ + arch/arm/odp_sysinfo_parse.c \ + arch/default/odp/api/cpu_arch.h \ + arch/default/odp_cpu_arch.c \ + arch/default/odp_sysinfo_parse.c \ + arch/mips64/odp/api/cpu_arch.h \ + arch/mips64/odp_cpu_arch.c \ + arch/mips64/odp_sysinfo_parse.c \ + arch/powerpc/odp/api/cpu_arch.h \ + arch/powerpc/odp_cpu_arch.c \ + arch/powerpc/odp_sysinfo_parse.c \ + arch/x86/odp/api/cpu_arch.h \ + arch/x86/odp_cpu_arch.c \ + arch/x86/odp_sysinfo_parse.c

-----------------------------------------------------------------------

Summary of changes: platform/Makefile.inc | 17 +++++++++++++++++ platform/linux-generic/Makefile.am | 17 ----------------- platform/linux-generic/include/odp_config_internal.h | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-)

hooks/post-receive