]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'columbia/kvm-arm-for-3.10' into kvm-arm-next
authorChristoffer Dall <cdall@cs.columbia.edu>
Wed, 22 May 2013 22:30:15 +0000 (15:30 -0700)
committerChristoffer Dall <cdall@cs.columbia.edu>
Wed, 22 May 2013 22:30:15 +0000 (15:30 -0700)
commit6f6615ee1b801c0c04b11e1b05a1c6802d800c14
tree94d31d6845add553d61d0329dcf1f872c2486452
parent08872bbe2a6c901dcade8006153cb066a9850589
parentd4e071ce6acf8d5eddb7615a953193a8b0ad7c38
Merge remote-tracking branch 'columbia/kvm-arm-for-3.10' into kvm-arm-next

Conflicts:
arch/arm/include/asm/kvm_host.h
arch/arm/kvm/arm.c