Merge branch 'at91' of git://git.denx.de/u-boot-atmel
authorWolfgang Denk <wd@denx.de>
Tue, 7 Sep 2010 22:42:00 +0000 (00:42 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 7 Sep 2010 22:42:00 +0000 (00:42 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge