Merge branch 'sf' of git://git.denx.de/u-boot-blackfin
authorWolfgang Denk <wd@denx.de>
Wed, 13 Oct 2010 18:58:51 +0000 (20:58 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 13 Oct 2010 18:58:51 +0000 (20:58 +0200)
commitda61f6c45ad4a126bf0a9a8184fadc13073ecb3f
tree846df43283ccfb4ad1717e1bbdd303d093def15c
parent9de99326935c158adda792ed8dd1df630434813e
parent0d3fe2b1534cd202a97e2a2dda403a9b24b169d3
Merge branch 'sf' of git://git.denx.de/u-boot-blackfin