]> git.proxmox.com Git - qemu.git/commit
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)
commit321f211707822b4c87f0bb89e4f46586fff43163
tree1eed37bdbcf7f4b9da3b48d9fd14019c6b0b4dc7
parentb0df98f3a2968eb5aba3075d1cf9b1a3931907e0
parentf61850bffbd0bb8b15aa55ebc3470bf1f8ce8664
Merge remote-tracking branch 'pmaydell/arm-devs.next' into staging

# 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