Merge branch 'spi' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Wed, 20 Mar 2013 18:55:10 +0000 (14:55 -0400)
committerTom Rini <trini@ti.com>
Wed, 20 Mar 2013 18:55:10 +0000 (14:55 -0400)
1  2 
include/configs/coreboot.h

Simple merge