]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:47:26 +0000 (11:47 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:47:26 +0000 (11:47 +0200)
commit1a5727b29335bff725bf130616b57874d3b9b4de
tree6150b65e1438dab5fc1941accde56152d1759cfe
parent3b97e2ee733b4321d15df5f19ee7d48c8af9aa03
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