From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 00:45:44 +0000 (+1000)
Subject: Merge remote-tracking branch 'arm64/upstream'
X-Git-Tag: next-20130619~110
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=856a84977386dea4312ea67046afadd1da9eb55a;p=karo-tx-linux.git

Merge remote-tracking branch 'arm64/upstream'

Conflicts:
	include/uapi/linux/kvm.h
---

856a84977386dea4312ea67046afadd1da9eb55a
diff --cc include/uapi/linux/kvm.h
index d88c8ee00c8b,aac27640bec2..acccd08be6c7
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -783,7 -784,7 +784,8 @@@ struct kvm_dirty_tlb 
  #define KVM_REG_IA64		0x3000000000000000ULL
  #define KVM_REG_ARM		0x4000000000000000ULL
  #define KVM_REG_S390		0x5000000000000000ULL
+ #define KVM_REG_ARM64		0x6000000000000000ULL
 +#define KVM_REG_MIPS		0x7000000000000000ULL
  
  #define KVM_REG_SIZE_SHIFT	52
  #define KVM_REG_SIZE_MASK	0x00f0000000000000ULL