]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Sat, 30 Apr 2011 20:45:55 +0000 (22:45 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 30 Apr 2011 20:45:55 +0000 (22:45 +0200)
1  2 
README
boards.cfg
drivers/spi/Makefile
include/configs/P1022DS.h

diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge
Simple merge
Simple merge