same as previous commit
Merge branch 'multicore' of github.com:ssabpisa/narrowwell-processor into multicore