Patch merged into coreboot/master: ab60510 spi flash: Organise options list

the following patch was just integrated into master:
commit ab605108184e53964e6f6a2300a1983aa7166422
Author: Kyösti Mälkki 
Date:   Mon Jun 30 07:49:55 2014 +0300

spi flash: Organise options list

Change-Id: I21e4e2384d9b8bbd34f652e99af11dee993fb41c
    Signed-off-by: Kyösti Mälkki 
    Reviewed-on: http://review.coreboot.org/6173
    Tested-by: build bot (Jenkins)
    Reviewed-by: Edward O'Callaghan 
    Reviewed-by: Paul Menzel 
    Reviewed-by: Patrick Georgi

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

-gerrit