Merge git://git.denx.de/u-boot-x86

This includes x86 edison defconfig file clean up, and coreboot file
system (cbfs) fixes.