commit | 14df77a609e39403c3ec814bae63bec0fb4d24d2 | [log] [tgz] |
---|---|---|
author | Anthony Liguori <aliguori@us.ibm.com> | Mon Sep 10 12:48:43 2012 -0500 |
committer | Anthony Liguori <aliguori@us.ibm.com> | Mon Sep 10 12:48:43 2012 -0500 |
tree | faabedbfdaa0d8b467368f2be07d7d4eb929c247 | |
parent | 455aa1e0818653c41fd794435b982426ce21ba2f [diff] | |
parent | 1241ed94c331ddd8fc8297b02b4508ead59467de [diff] |
Merge remote-tracking branch 'mst/tags/for_anthony' into staging * mst/tags/for_anthony: vhost: Pass device path to vhost_dev_init() monitor: Rename+move net_handle_fd_param -> monitor_handle_fd_param pcie_aer: clear cmask for Advanced Error Interrupt Message Number pcie: drop version_id field for live migration qemu: add .exrc