Merge branch 'for-upstream' of git://git.denx.de/u-boot-atmel
authorWolfgang Denk <wd@denx.de>
Fri, 17 Dec 2010 18:55:55 +0000 (19:55 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 17 Dec 2010 18:55:55 +0000 (19:55 +0100)
commit85579906cb241ab0f544a2d5ba6d9e33714ec897
tree85646b2816f849b9482be4061fccee5718997960
parent8a16f9c6747447aecda6619568d6747f0adf6561
parenta138d96aa88b6487c1409dd47a4ece9c3e1c3115
Merge branch 'for-upstream' of git://git.denx.de/u-boot-atmel