xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
parent b9818c3312 689dfa894c
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