Merge branch 'fix' of git://git.denx.de/u-boot-pxa
authorWolfgang Denk <wd@denx.de>
Thu, 17 Jun 2010 20:31:04 +0000 (22:31 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 17 Jun 2010 20:31:04 +0000 (22:31 +0200)
commit1f241263e088a71b8f33f87b03a37c5418d41e2e
tree8bd9dbdfa3a19f322810e2ad9e6d6551602d8afe
parentcecda170e7816d10edf0f5e64c420e9c618001ec
parent3a96ad851f4f9267e1199b700cb838a77334e4b2
Merge branch 'fix' of git://git.denx.de/u-boot-pxa