[coreboot-gerrit] Patch merged into coreboot/master: 455fcaf elog: Fix chromium merge issue

[gerrit at coreboot.org]

the following patch was just integrated into master:
commit 455fcaf146563a802e3915340ee92cac24d5de59
Author: Marc Jones <marc.jones at se-eng.com>
Date:   Tue Dec 16 20:29:27 2014 -0700

    elog: Fix chromium merge issue
    
    This cleans up a mis-merge in elog.c and puts the following
    change back:
    
    drivers/elog: Unmangle header include out of pre-proc cond
    commit a3119e5835e4b8fd510d046c56a3bf2bf43a5c0d
    
    Change-Id: Iafbbd381efdb103717022d2a3c342da376a9428f
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    Reviewed-on: http://review.coreboot.org/7838
    Tested-by: build bot (Jenkins)
    Reviewed-by: Stefan Reinauer <stefan.reinauer at coreboot.org>


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

-gerrit