Merge branch 'at91' of git://git.denx.de/u-boot-atmel
authorWolfgang Denk <wd@denx.de>
Fri, 12 Nov 2010 21:29:21 +0000 (22:29 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 12 Nov 2010 21:29:21 +0000 (22:29 +0100)

Trivial merge