]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'jliu/or32' into staging
authorAnthony Liguori <anthony@codemonkey.ws>
Thu, 22 Aug 2013 14:29:13 +0000 (09:29 -0500)
committerAnthony Liguori <anthony@codemonkey.ws>
Thu, 22 Aug 2013 14:29:13 +0000 (09:29 -0500)
# By Jia Liu
# Via Jia Liu
* jliu/or32:
  hw/openrisc: Avoid undefined shift in openrisc_pic_cpu_handler()
  hw/openrisc: Fix masking in openrisc_pic_cpu_handler()
  hw/openrisc: Avoid using uninitialised variable 'entry'

Message-id: 1377050811-11116-1-git-send-email-proljc@gmail.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>

Trivial merge