Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Wed, 21 Aug 2013 20:27:47 +0000 (16:27 -0400)
committerTom Rini <trini@ti.com>
Wed, 21 Aug 2013 20:27:47 +0000 (16:27 -0400)
commit6612ab33956ae09c5ba2fde9c1540b519625ba37
treeb6da2e20793336cf0eed44292edb3b5e7ce88819
parent3fb858891273945ce2238e6d4dac3363a1fb0853
parentb6df9b01fb8c126b212aba92b6523407d3fa60a5
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
arch/powerpc/cpu/mpc85xx/cmd_errata.c
arch/powerpc/cpu/ppc4xx/cpu.c
arch/powerpc/include/asm/config_mpc85xx.h