diff options
author | Michael Young <m.a.young@durham.ac.uk> | 2010-11-29 22:17:14 +0000 |
---|---|---|
committer | Michael Young <m.a.young@durham.ac.uk> | 2010-11-29 22:17:14 +0000 |
commit | 2279d902a9a53b54c7532be1aa2ea69865140f06 (patch) | |
tree | 2d642afbe08133cf4f446867d1e47c9d3c99e885 /xen.pvops.patch | |
parent | ba5342c1b103befdf6ccba59d1ec1e6400947f56 (diff) | |
parent | b3e99df1c8efe575a715e62dea0c5d66ceaf52c4 (diff) | |
download | dom0-kernel-2279d902a9a53b54c7532be1aa2ea69865140f06.tar.gz dom0-kernel-2279d902a9a53b54c7532be1aa2ea69865140f06.tar.xz dom0-kernel-2279d902a9a53b54c7532be1aa2ea69865140f06.zip |
Merge branch 'f12/master' into f12/user/myoung/xendom0
Conflicts:
kernel.spec
Diffstat (limited to 'xen.pvops.patch')
0 files changed, 0 insertions, 0 deletions