diff options
author | Michael Young <m.a.young@durham.ac.uk> | 2010-10-06 21:55:06 +0100 |
---|---|---|
committer | Michael Young <m.a.young@durham.ac.uk> | 2010-10-06 21:55:06 +0100 |
commit | 5bf54082f310864d1a7255678922d77e3067e861 (patch) | |
tree | c7796d879b84ce88958c0987cb48ab1b1c1e6934 /config-x86-generic | |
parent | c52a0441d702570191731cd61e545f264be0397f (diff) | |
parent | 9d54ccf27df6b22bf994917b21d0a7c055d30d6a (diff) | |
download | dom0-kernel-5bf54082f310864d1a7255678922d77e3067e861.tar.gz dom0-kernel-5bf54082f310864d1a7255678922d77e3067e861.tar.xz dom0-kernel-5bf54082f310864d1a7255678922d77e3067e861.zip |
Merge branch 'f12/master' into f12/user/myoung/xendom0
Conflicts:
kernel.spec
Diffstat (limited to 'config-x86-generic')
0 files changed, 0 insertions, 0 deletions