Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Mon, 13 May 2013 22:17:39 +0000 (18:17 -0400)
committerTom Rini <trini@ti.com>
Mon, 13 May 2013 22:17:39 +0000 (18:17 -0400)
commita661b99dbc35e725f229a7b8e189ca21304ba026
treeb3f329efb8cda7a47db2b0e7bbbf6454a3e76db8
parenta7e62be09189dae3a16882e53f15c38754f9db91
parent8f0278eab4410de57ea6a32a8e5a50614a28084f
Merge branch 'master' of git://git.denx.de/u-boot-x86