Merge branch 'kvm-arm-fixes-3.9' of git://github.com/columbia/linux-kvm-arm
authorMarcelo Tosatti <mtosatti@redhat.com>
Tue, 16 Apr 2013 23:49:47 +0000 (20:49 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Tue, 16 Apr 2013 23:49:47 +0000 (20:49 -0300)
commit23125c40e0a701c80046f8c05d5aae48c704c78c
tree2cdaf026ea384e6d3e1ce3531d6da598cfefd04c
parent4d2be6f7c75e814ee28b007dbf0c26dfcbbe20a1
parent865499ea90d399e0682bcce3ae7af24277633699
Merge branch 'kvm-arm-fixes-3.9' of git://github.com/columbia/linux-kvm-arm

* 'kvm-arm-fixes-3.9' of git://github.com/columbia/linux-kvm-arm:
  ARM: KVM: fix L_PTE_S2_RDWR to actually be Read/Write
  ARM: KVM: fix KVM_CAP_ARM_SET_DEVICE_ADDR reporting

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>