diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-21 20:19:18 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-21 20:19:18 +0200 |
| commit | 5b2b9d776102a82848b73964dd12fa41eb697e27 (patch) | |
| tree | 629ab0c1761e336dc6051552fbe16b4c7fbefe76 /net/can | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff) | |
| parent | Merge tag 'signed-for-3.16' of git://github.com/agraf/linux-2.6 into kvm-master (diff) | |
| download | linux-5b2b9d776102a82848b73964dd12fa41eb697e27.tar.xz linux-5b2b9d776102a82848b73964dd12fa41eb697e27.zip | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull kvm fixes from Paolo Bonzini:
"These are mostly PPC changes for 3.16-new things. However, there is
an x86 change too and it is a regression from 3.14. As it only
affects nested virtualization and there were other changes in this
area in 3.16, I am not nominating it for 3.15-stable"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: x86: Check for nested events if there is an injectable interrupt
KVM: PPC: RTAS: Do byte swaps explicitly
KVM: PPC: Book3S PR: Fix ABIv2 on LE
KVM: PPC: Assembly functions exported to modules need _GLOBAL_TOC()
PPC: Add _GLOBAL_TOC for 32bit
KVM: PPC: BOOK3S: HV: Use base page size when comparing against slb value
KVM: PPC: Book3E: Unlock mmu_lock when setting caching atttribute
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions