]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0df98f f61850b)
Merge remote-tracking branch 'pmaydell/arm-devs.next' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 30 Jan 2013 16:51:47 +0000 (10:51 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 30 Jan 2013 16:51:47 +0000 (10:51 -0600)
# By Christoffer Dall (1) and Peter Maydell (1)
# Via Peter Maydell
* pmaydell/arm-devs.next:
  hw/vexpress: Use correct HBI (board model number) for vexpress-a15
  hw/arm_sysctl: Clear sysctl cfgctrl start bit


Trivial merge
Qemu copy for testing