[coreboot-gerrit] Patch merged into coreboot/master: c41fd4b arm/armv7: drop merge left-over

the following patch was just integrated into master:
commit c41fd4b75c223d1ef44e8b7820a94801752790fc
Author: Patrick Georgi 
Date:   Thu Apr 30 14:30:08 2015 +0200

arm/armv7: drop merge left-over

Fixes up commit 93d8e3c4 (armv7-m: add armv7-m configuration).

Change-Id: Ie0b6c90e9ce89d564e3345d2746297f39ba9121d
    Signed-off-by: Patrick Georgi 
    Reviewed-on: http://review.coreboot.org/10042
    Tested-by: build bot (Jenkins)
    Reviewed-by: Paul Menzel 
    Reviewed-by: Aaron Durbin

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

-gerrit