Merge branch 'testing' into page_alloc

Signed-off-by: Bart Kuivenhoven <bemkuivenhoven@gmail.com>

Conflicts:
	src/drivers/timer/timer.c