summaryrefslogtreecommitdiffstats
path: root/cpu/ppc4xx
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-10-24 17:08:31 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-10-24 17:08:31 +0200
commitd97370feca2a589dad42154577bb4615a0347852 (patch)
tree5a3f85d24e07425977b7019017ae1615c0f12ce7 /cpu/ppc4xx
parent9fa48022e5883a0826a98979c0156f6ac5a0ef79 (diff)
parent47a6989c10685d2ab3efcf95228ce50d2a496d3e (diff)
downloadtalos-obmc-uboot-d97370feca2a589dad42154577bb4615a0347852.tar.gz
talos-obmc-uboot-d97370feca2a589dad42154577bb4615a0347852.zip
Merge with /home/wd/git/u-boot/master
(Conflicts between Jon Loeliger's and Matthew McClintock's tree were resolved by in favour of Jon's version.)
Diffstat (limited to 'cpu/ppc4xx')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud