Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Mon, 13 Dec 2010 23:06:00 +0000 (00:06 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 13 Dec 2010 23:06:00 +0000 (00:06 +0100)
commit63440c4a80cef3dafdb931a7f914dc6b53eb27e4
tree7836b9e2e3a770ba5365dc861dcafa303122e654
parentfdb9482b42c28d314317ea0118181b1f32a7c689
parent3600945b5aebb2d029c97c48a38d8dc960ad6935
Merge branch 'master' of git://git.denx.de/u-boot-arm