Patch merged into coreboot/master: ddcd9bd arch/arm: Move inclusion of timestamps.c to the right directory

the following patch was just integrated into master:
commit ddcd9bd19fd1a976ea518d2de1e354bb1f53e506
Author: Patrick Georgi 
Date:   Mon Apr 27 18:02:11 2015 +0200

arch/arm: Move inclusion of timestamps.c to the right directory

Without this, building with COLLECT_TIMESTAMPS fails.
    Fixes a mistake during upstreaming in commit 0de8820.

Change-Id: Ie56bd38649a821f6b22a1e5dee5f50ef397035fe
    Signed-off-by: Patrick Georgi 
    Reviewed-on: http://review.coreboot.org/10002
    Tested-by: build bot (Jenkins)
    Reviewed-by: Stefan Reinauer 
    Reviewed-by: Paul Menzel

See http://review.coreboot.org/10002 for details.

-gerrit