diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-01-29 18:29:01 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-01-29 18:29:01 +0100 |
| commit | b73117c49364551ff789db7c424a115ac5b77850 (patch) | |
| tree | e151d34e68ef6061f1ac10f5db0aff262dc3aff5 /fs/nfsd/nfsd.h | |
| parent | 77f01bdfa5e55dc19d3eb747181d2730a9bb3ca8 (diff) | |
| parent | 4068890931f62752abc3591e7b3736e7537c6dcb (diff) | |
| download | op-kernel-dev-b73117c49364551ff789db7c424a115ac5b77850.zip op-kernel-dev-b73117c49364551ff789db7c424a115ac5b77850.tar.gz | |
Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue
Conflicts:
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/kvm/booke.c
Diffstat (limited to 'fs/nfsd/nfsd.h')
0 files changed, 0 insertions, 0 deletions
