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)
commit9692cab76f7b7891f71c8a9b189465cd3bd68ef0
treed84348280c2993329787ef7881ada85241d2f61b
parent2caea1ebee1fb20e1b229f1f821225829fb87f0e
parent63676841ca2d603b13765f3f7b72ff1a61c23f90
Merge branch 'master' of git://denx.de/git/u-boot-net
cpu/mpc83xx/cpu.c
cpu/mpc85xx/cpu.c