Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Mon, 3 Dec 2012 13:47:05 +0000 (06:47 -0700)
committerTom Rini <trini@ti.com>
Mon, 3 Dec 2012 13:47:05 +0000 (06:47 -0700)
commitce12a8c1a94a2b3d585feff387497f724b98e3ce
tree6e5db764e27df2465f5e4d9487c7561d14050064
parentb04eb342af72d5dbcc29ccd7f3f9475044113361
parent339c5111065c2b1893af1e4d6e9431b9496879a4
Merge branch 'master' of git://git.denx.de/u-boot-x86