Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Wed, 9 Jan 2013 15:13:22 +0000 (08:13 -0700)
committerTom Rini <trini@ti.com>
Wed, 9 Jan 2013 15:13:22 +0000 (08:13 -0700)
commit642ef40bdc95bef829ae3aadc217f829c4c298c4
tree57d6d5170b904176a2a7018e08a615b8725c8874
parent449485948e6de1869ec39c1559b7b78d85690ea7
parent61bdb9133593f0f881a57232039296f64bd662ed
Merge branch 'master' of git://git.denx.de/u-boot-arm