summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-01-15 12:14:29 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2014-01-15 12:14:29 +0100
commitab53f22e2e2dbb60d4eb1b505776f03da4aa9bdc (patch)
tree6ebddac80d6f05c4ac58186227c062e94f55ada2 /Documentation
parent4a55dd7273c95b4a19fbcf0ae1bbd1cfd09dfc36 (diff)
parent61466710de078c697106fa5b70ec7afc9feab520 (diff)
downloadop-kernel-dev-ab53f22e2e2dbb60d4eb1b505776f03da4aa9bdc.zip
op-kernel-dev-ab53f22e2e2dbb60d4eb1b505776f03da4aa9bdc.tar.gz
Merge tag 'kvm-arm-for-3.14' of git://git.linaro.org/people/christoffer.dall/linux-kvm-arm into kvm-queue
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/virtual/kvm/api.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
index a8cdc7b..366bf4b 100644
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
@@ -2327,7 +2327,7 @@ current state. "addr" is ignored.
Capability: basic
Architectures: arm, arm64
Type: vcpu ioctl
-Parameters: struct struct kvm_vcpu_init (in)
+Parameters: struct kvm_vcpu_init (in)
Returns: 0 on success; -1 on error
Errors:
 EINVAL:    the target is unknown, or the combination of features is invalid.
OpenPOWER on IntegriCloud