smartassfalcon: fix merge derp
Cortex-a7 time