]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:58:43 +0000 (14:58 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:58:43 +0000 (14:58 +0200)
commit28d1b7d96ee62f8a67254fc30766e4f777ff64ee
tree7defdb8f70d9cd459337f4f5c7c39ce8c393462e
parent01ad95d812b5be09bec8176090eda744df4edd47
parent79c648806f9034abf54332b78043bb242189d953
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'

Conflicts:
arch/arm/kvm/reset.c
arch/arm/include/asm/pgtable-3level.h
arch/arm/kvm/reset.c