summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-27 01:17:00 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-27 01:17:00 +0400
commit7f54492fbca0074d7db117d7972a80347e0b40a5 (patch)
treea42f39bbcc84af8f13c2fd46502324741536657d /drivers
parent6fd8fb7f55cb6d45e7f078cd0eaf7e3c243f6c33 (diff)
parentfae9dbb4b462d2c908186a47464c7a5299ee27a9 (diff)
downloadlinux-7f54492fbca0074d7db117d7972a80347e0b40a5.tar.xz
Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: PPC: e500: include linux/export.h KVM: PPC: fix kvmppc_start_thread() for CONFIG_SMP=N KVM: PPC: protect use of kvmppc_h_pr KVM: PPC: move compute_tlbie_rb to book3s_64 common header KVM: Don't automatically expose the TSC deadline timer in cpuid KVM: Device assignment permission checks KVM: Remove ability to assign a device without iommu support KVM: x86: Prevent starting PIT timers in the absence of irqchip support
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions