Merge 3.10-rc6 into tty-next
We want the changes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
		
				commit
				
					
						bf32d52c45
					
				
			
		
					 241 changed files with 2627 additions and 1847 deletions
				
			
		| 
						 | 
				
			
			@ -783,6 +783,7 @@ struct kvm_dirty_tlb {
 | 
			
		|||
#define KVM_REG_IA64		0x3000000000000000ULL
 | 
			
		||||
#define KVM_REG_ARM		0x4000000000000000ULL
 | 
			
		||||
#define KVM_REG_S390		0x5000000000000000ULL
 | 
			
		||||
#define KVM_REG_MIPS		0x7000000000000000ULL
 | 
			
		||||
 | 
			
		||||
#define KVM_REG_SIZE_SHIFT	52
 | 
			
		||||
#define KVM_REG_SIZE_MASK	0x00f0000000000000ULL
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue