Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Wed, 7 Apr 2010 22:06:31 +0000 (00:06 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 7 Apr 2010 22:06:31 +0000 (00:06 +0200)
commit6a1f7e54c2dd8888dbc118e8de372dec29a0a9c5
treedf5b6d67be790d75e60f8fcd97360fc1f179ab0d
parentd8bc0a2889700ba063598de6d4e7d135360b537e
parentb5045cdda556c73e2697cd1d3ea6563315cbf490
Merge branch 'master' of git://git.denx.de/u-boot-arm