Patch merged into coreboot/master: 3d78ece haswell: Fix monotonic timer integration

the following patch was just integrated into master:
commit 3d78ece7d02797187a56ada8ba8ae379df4a5b95
Author: Stefan Reinauer 
Date:   Mon Mar 16 16:53:27 2015 -0700

haswell: Fix monotonic timer integration

In some previous attempt to enable monotonic timers on all platforms,
    the LAPIC monotonic timer was selected for Haswell devices, despite
    the fact that LAPIC timers are not used in coreboot on Haswell
    (See haswell Kconfig) and there already was a monotonic timer
    implementation enabled that just needed to be added for SMM as well.

Change-Id: I6beb2977864e507956636860ed463e1991cea1ed
    Signed-off-by: Stefan Reinauer 
    Reviewed-on: http://review.coreboot.org/8702
    Tested-by: build bot (Jenkins)
    Reviewed-by: Aaron Durbin

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

-gerrit