Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Wed, 30 Sep 2009 21:39:36 +0000 (23:39 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 30 Sep 2009 21:39:36 +0000 (23:39 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge