Patch merged into coreboot/master: 55ab5ef smbios.c: Fix mismerge which led to laptop being default type

the following patch was just integrated into master:
commit 55ab5ef393c727afaae1e971ae0d7cbff6471203
Author: Vladimir Serbinenko 
Date:   Tue Sep 2 02:08:32 2014 +0200

smbios.c: Fix mismerge which led to laptop being default type

Change-Id: I97ccd08a5e7f094908ed3a85ddae53b158124995
    Signed-off-by: Vladimir Serbinenko 
    Reviewed-on: http://review.coreboot.org/6823
    Tested-by: build bot (Jenkins)
    Reviewed-by: Edward O'Callaghan

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

-gerrit