Merge branch 'master' of git://github.com/projectNe10/Ne10

diff --cc common/NE10_mask_table.c
Simple merge

diff --cc common/NE10_mask_table.h
Simple merge

diff --cc inc/NE10_dsp.h
Simple merge

diff --cc inc/NE10_types.h
Simple merge

diff --cc modules/CMakeLists.txt
Simple merge

diff --cc modules/dsp/NE10_init_dsp.c
Simple merge