# HG changeset patch
# User Jimi Xenidis <[EMAIL PROTECTED]>
# Node ID 014c4ef0e124a81a072a92bd4cff17e6214d8897
# Parent 4b07d05c1b4e3492199e118d03f89209caffcad2
# Parent 9a758f814f60166dcf4a386bb9835f58c8f68502
merge
---
xen/arch/powerpc/boot_of.c | 16
1 files changed, 12 in
# HG changeset patch
# User Jimi Xenidis <[EMAIL PROTECTED]>
# Node ID 3dfeb3e4a03f0f1eb6b015b89e7d7cc2f2d50207
# Parent 9372353e3b095cfaf82d09c8b891d9a2b58ca735
# Parent ff3ab3fc802484087ecf24521f66c4f7ab44849a
merge
---
xen/arch/powerpc/Makefile |6 ++
xen/common/gdbstub.c |1
# HG changeset patch
# User Jimi Xenidis <[EMAIL PROTECTED]>
# Node ID 3583d270140501b208f08335e10105d3f05c52d8
# Parent 1849e7806e199e8feecb280605c53c9949541d9b
# Parent a41b8cd01ad287d60a5e59ccffa23b5dd8837af8
merge
---
xen/arch/powerpc/boot/boot32.S | 75 --
# HG changeset patch
# User Hollis Blanchard <[EMAIL PROTECTED]>
# Node ID a79b3252bbe46a13d91586081e7f6be278b07126
# Parent 0fb10fe89f52ba893200166d28a789f7672c6984
# Parent 90ffbced39b16124f53e0aaed468a9dc64cafb5b
merge
Signed-off-by: Hollis Blanchard <[EMAIL PROTECTED]>
__
# HG changeset patch
# User Jimi Xenidis <[EMAIL PROTECTED]>
# Node ID 715014b9548840332aec42a5bc230818cab05064
# Parent a9225284962e7056929d16684f562105b9b452f1
# Parent a6d69c2d85a35a149313bad1639a240ed7f79699
[merge]
---
tools/libxc/powerpc64/ft_build.c| 551 -
# HG changeset patch
# User Jimi Xenidis <[EMAIL PROTECTED]>
# Node ID 00c47d5766100994d1b936873629256874a8d5ba
# Parent ff2c736fce49fedc8057d61f13df0a79ead22871
# Parent b2f2c477895af973e727612a3967c68639a2b321
[merge] null
---
tools/python/xen/xend/FlatDeviceTree.py |2 -
tools/python/xen/
# HG changeset patch
# User Jimi Xenidis <[EMAIL PROTECTED]>
# Node ID e06e2cca9f39d56344ec96b90ad4a2405b247996
# Parent f2527015891cfd68f4576a8c63d3ee60e99841e2
# Parent b985b2e85bf343f136ec2ceb55176edb62832f81
[merge] conflict
---
tools/python/xen/xend/FlatDeviceTree.py | 87
# HG changeset patch
# User Jimi Xenidis <[EMAIL PROTECTED]>
# Node ID 4055b6b010a4ccdd480abae1a97d1ca9de18703e
# Parent 4cffec02b4788bc74d8a0ed7560fadbf332892b1
# Parent 9c72449e4370128446fa902d0183080289bdde12
[merge]
---
tools/libxc/powerpc64/ft_build.c | 165 +++-
# HG changeset patch
# User Jimi Xenidis <[EMAIL PROTECTED]>
# Node ID c3a10094bfae99139c96aac904116ea54ecbe069
# Parent f46a34f4dea16dc107404aec8fbabc007506fe65
# Parent d5af6a21a324163b5371ce8733535ebee46156c5
merge
---
tools/libxc/xc_ppc_linux_build.c| 38 +--