diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-05 15:09:38 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-05 15:09:41 +1000 |
| commit | 2b0108ac20b9759df34e9aa0ef20aca3491d70fa (patch) | |
| tree | b591680f2c674fc55c86a7b5993fa810481aae92 /arch/x86/xen | |
| parent | b360a35dd18438621ef29b2dab751799596fe7c3 (diff) | |
| parent | 8e6afa36e754be84b468d7df9e5aa71cf4003f3b (diff) | |
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Conflicts:
Documentation/virtual/kvm/api.txt
Diffstat (limited to 'arch/x86/xen')
0 files changed, 0 insertions, 0 deletions