]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 52346e8 9bea6a2)
Merge remote-tracking branch 'kiszka/queues/pending' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 16 Apr 2012 17:56:28 +0000 (12:56 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 16 Apr 2012 17:56:28 +0000 (12:56 -0500)
commitfc34e77bb3dd41a9932ec5830c06bcade1f5a08e
tree93a7c849cc543757381e0fd230e46debf377dcbbtree
parent52346e8c75eba1ece4a782565d5a5ce2e23d5117commit | diff
parent9bea6a2956e5d473b8914b2a5483fbf187b33844commit | diff
Merge remote-tracking branch 'kiszka/queues/pending' into staging

* kiszka/queues/pending:
  vapic: Disable for pre-1.1 machines
  Kick io-thread on qemu_chr_accept_input
  pcnet: Properly handle TX requests during Link Fail
  pcnet: Clear ERR in CSR0 on stop
  signrom: Rewrite as python script

Conflicts:
hw/pc_piix.c

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
hw/pc_piix.c diff1 | diff2 | blob | history
Qemu copy for testing