[coreboot-gerrit] Patch merged into coreboot/master: f21271e Fix mismerge of ACPI patches

the following patch was just integrated into master:
commit f21271edb5406577dc0a062ce3068ef17a09309d
Author: Vladimir Serbinenko 
Date:   Thu Oct 16 18:00:27 2014 +0200

Fix mismerge of ACPI patches

Change-Id: I2a9960861465f4686113213d5e5793333b6274b2
    Signed-off-by: Vladimir Serbinenko 
    Reviewed-on: http://review.coreboot.org/7079
    Tested-by: build bot (Jenkins)
    Reviewed-by: Patrick Georgi

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

-gerrit