forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'merge' into next

Browse source 
Merge "merge" branch to bring in various bug fixes that are
going into 3.8
This commit is contained in:
Benjamin Herrenschmidt 2013-01-29 11:33:37 +11:00
commit dfd0436ad0
710 changed files with 13309 additions and 4053 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/include/uapi/asm/kvm_para.h
View file

@ -78,7 +78,7 @@ struct kvm_vcpu_arch_shared {
#define KVM_HCALL_TOKEN(num) _EV_HCALL_TOKEN(EV_KVM_VENDOR_ID, num)
#include <uapi/asm/epapr_hcalls.h>
#include <asm/epapr_hcalls.h>
#define KVM_FEATURE_MAGIC_PAGE 1