Merge branch 'kvm-arm64/for-3.14' into kvm-arm64/next
authorMarc Zyngier <marc.zyngier@arm.com>
Sat, 28 Dec 2013 10:29:37 +0000 (10:29 +0000)
committerMarc Zyngier <marc.zyngier@arm.com>
Sat, 28 Dec 2013 10:29:37 +0000 (10:29 +0000)
1  2 
arch/arm64/include/uapi/asm/kvm.h

Simple merge