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)

Trivial merge