Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Tue, 16 Apr 2013 20:12:33 +0000 (16:12 -0400)
committerTom Rini <trini@ti.com>
Tue, 16 Apr 2013 20:12:33 +0000 (16:12 -0400)
commit314dd4fecc87175f6e79eb977966fb60b33c543c
treebfe799c8730caab5ca507e50ab8dfe09e8c4abfb
parent5873d0fbad2b1a94db7b9c8c8f5d77c10479a9dd
parent617c246f3c123d4a2d4dba9d08a4a2dd324cb407
Merge branch 'master' of git://git.denx.de/u-boot-x86