Merge branch 'master' of git://git.denx.de/u-boot-x86
x86: Rename i386 to x86 Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
12345