Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Wed, 29 Oct 2014 19:57:59 +0000 (15:57 -0400)
committerTom Rini <trini@ti.com>
Wed, 29 Oct 2014 19:57:59 +0000 (15:57 -0400)
commit2c54cb5516238ae93c930dee7f8e353291f2cdfb
tree17a1322a88f7381964bb1c89f8ed4b15472bbd3d
parentb8be4e365c6f7b5351037bba5d400ace9363fa0a
parent026090e4c51e00841b04abf58f48cc3a45654bc4
Merge git://git.denx.de/u-boot-x86