Patch merged into coreboot/master: arch/x86/asembly_entry: reorder conditional stage entry macros

the following patch was just integrated into master:
commit 800b0173c98101ee6ad2c7eaf1951a435c819fd9
Author: Aaron Durbin 
Date:   Fri Apr 29 12:10:28 2016 -0500

arch/x86/asembly_entry: reorder conditional stage entry macros

The path that just clears CAR_GLOBAL variables and jumps
    to the stage entry point needs another condition for
    separate verstage just after bootblock. However, the
    current conditional is a negative conditional so
    swap the logic around to make it easier to extend.

Change-Id: Iab6682498054715a6eaa0476390da6355238b9bc
    Signed-off-by: Aaron Durbin 
    Reviewed-on: https://review.coreboot.org/14547
    Tested-by: build bot (Jenkins)
    Reviewed-by: Furquan Shaikh 
    Reviewed-by: Andrey Petrov 
    Reviewed-by: Leroy P Leahy

See https://review.coreboot.org/14547 for details.

-gerrit