diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-17 23:45:02 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-17 23:45:02 +0100 |
commit | 6e9c6e87a662c6665053fc3cc7840ed6fa80414e (patch) | |
tree | 2c573ee6bd9e9d77b35ec956e3dfe8aca0ae6fa6 /Documentation/virtual | |
parent | Staging: comedi: kcomedilib: replace deprecated simple_strtoul() with kstrtou... (diff) | |
parent | Linux 3.14-rc3 (diff) | |
download | linux-6e9c6e87a662c6665053fc3cc7840ed6fa80414e.tar.xz linux-6e9c6e87a662c6665053fc3cc7840ed6fa80414e.zip |
Merge 3.14-rc3 into staging-next
We want the fixes in this branch to make testing and future work easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/virtual')
-rw-r--r-- | Documentation/virtual/kvm/00-INDEX | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/virtual/kvm/00-INDEX b/Documentation/virtual/kvm/00-INDEX index 641ec9220179..fee9f2bf9c64 100644 --- a/Documentation/virtual/kvm/00-INDEX +++ b/Documentation/virtual/kvm/00-INDEX @@ -20,5 +20,7 @@ ppc-pv.txt - the paravirtualization interface on PowerPC. review-checklist.txt - review checklist for KVM patches. +s390-diag.txt + - Diagnose hypercall description (for IBM S/390) timekeeping.txt - timekeeping virtualization for x86-based architectures. |