added timing functions activated by macro
Merge branch 'master' of https://github.com/fpga-logi/Logi-kernel

Conflicts:
	beaglebone-black/common/main_dma.c
trying to fix a messy merge (my bad)
small compile bug corrected
added a useful comment