Merge branch 'master' of git://www.denx.de/git/u-boot-net
authorWolfgang Denk <wd@denx.de>
Wed, 9 Jul 2008 21:22:54 +0000 (23:22 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 9 Jul 2008 21:22:54 +0000 (23:22 +0200)
1  2 
cpu/mpc83xx/cpu.c
cpu/mpc85xx/cpu.c

Simple merge
Simple merge