summaryrefslogtreecommitdiffstats
path: root/net/core/sock_diag.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-01-15 10:54:30 +1300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-01-15 10:54:30 +1300
commit48c53db22032841290113799d43b24a677a4b24a (patch)
tree2a73075e8135f8165d5e9a5fd9471e2c26679779 /net/core/sock_diag.c
parent6fb400d36de0926309c8059ad81b0091593c2931 (diff)
parent801f6772cecea6cfc7da61aa197716ab64db5f9e (diff)
downloadop-kernel-dev-48c53db22032841290113799d43b24a677a4b24a.zip
op-kernel-dev-48c53db22032841290113799d43b24a677a4b24a.tar.gz
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull kvm fixes from Paolo Bonzini: "Two bugfixes for arm64. I will have another pull request next week, but otherwise things are calm" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: arm64: KVM: Fix HCR setting for 32bit guests arm64: KVM: Fix TLB invalidation by IPA/VMID
Diffstat (limited to 'net/core/sock_diag.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud