summaryrefslogtreecommitdiff
path: root/net/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-11 12:11:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-11 12:11:33 -0700
commit30b229bdd88445c550efbeb076ffaa251eb05364 (patch)
tree0f4e613cf4fdbb005b572dfed2dad073c6297f6b /net/Makefile
parent9e6bdaaaa53efb9ab03bdd0229fb09180ef65825 (diff)
parente769ece3b129698d2b09811a6f6d304e4eaa8c29 (diff)
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull s390 kvm fixes from Paolo Bonzini: "Two fixes for s390" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: s390: fix pfmf non-quiescing control handling KVM: s390: move kvm_guest_enter,exit closer to sie
Diffstat (limited to 'net/Makefile')
0 files changed, 0 insertions, 0 deletions