summaryrefslogtreecommitdiffstats
path: root/cpu/mpc86xx
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2006-09-19 08:51:24 -0500
committerJon Loeliger <jdl@freescale.com>2006-09-19 08:51:24 -0500
commitafa98843e4665add11b69496341053b268156e3a (patch)
tree116878b6b94920a5f282d0a16e4b9ad9dfaf57ff /cpu/mpc86xx
parentb440d0ef72e6278973d3220c10136a4c0624c286 (diff)
parentaeec782b020930732eab075af97212c3f03afcae (diff)
downloadblackbird-obmc-uboot-afa98843e4665add11b69496341053b268156e3a.tar.gz
blackbird-obmc-uboot-afa98843e4665add11b69496341053b268156e3a.zip
Merge branch 'master' of http://www.denx.de/git/u-boot
Conflicts: board/stxxtc/Makefile
Diffstat (limited to 'cpu/mpc86xx')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud