Merge branch 'master' of git://www.denx.de/git/u-boot-x86
authorTom Rini <trini@ti.com>
Wed, 28 Nov 2012 20:44:40 +0000 (13:44 -0700)
committerTom Rini <trini@ti.com>
Wed, 28 Nov 2012 20:44:40 +0000 (13:44 -0700)
commite57d9d15eeab923f6c0de05d7caad317d861bbc5
tree4c48c08c983e1b50850cdc7206ed4fb796087bed
parenta86fcff69519841aa1338efb1ace37ca77c16c35
parentd02a568e9aa3c3500d9b680f60782c192fd51691
Merge branch 'master' of git://denx.de/git/u-boot-x86