]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3c615b a287963)
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 patch | diff1 | diff2 | blob | history
boards.cfg patch | diff1 | diff2 | blob | history
drivers/spi/Makefile patch | diff1 | diff2 | blob | history
include/configs/P1022DS.h patch | diff1 | diff2 | blob | history

diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge
diff --cc drivers/spi/Makefile
Simple merge
diff --cc include/configs/P1022DS.h
Simple merge
Cloned from git://git.denx.de/u-boot.git