Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Wed, 9 Jan 2008 23:49:59 +0000 (00:49 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 9 Jan 2008 23:49:59 +0000 (00:49 +0100)
1  2 
Makefile

diff --cc Makefile
Simple merge