Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Fri, 17 Dec 2010 19:02:05 +0000 (20:02 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 17 Dec 2010 19:02:05 +0000 (20:02 +0100)
1  2 
include/configs/top9000.h

Simple merge