Merge branch 'master' of git://git.denx.de/u-boot-imx
authorWolfgang Denk <wd@denx.de>
Fri, 21 May 2010 20:22:23 +0000 (22:22 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 21 May 2010 20:22:23 +0000 (22:22 +0200)
commit8a452c2c17bc284e3f91b8ed4aec9d2b9b342df7
tree95d411f913fa4634df6ba86ce7af4bbbe98a92c0
parent445093d175b06226549680b6894923bb0f5e50fa
parent03af5abd85637d27e96fb999ce6e3992293570b0
Merge branch 'master' of git://git.denx.de/u-boot-imx