Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Wed, 3 Feb 2010 19:10:20 +0000 (20:10 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 3 Feb 2010 19:10:20 +0000 (20:10 +0100)
1  2 
include/configs/MPC8569MDS.h

Simple merge