| commit | 16be05f3fcf6efa7790f9fd0803ed7c63eab1fd7 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 7 Jan 2010 19:01:06 +0000 (7 17:01 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 7 Jan 2010 19:01:06 +0000 (7 17:01 -0200) | ||
| tree | 2b2e6f369f4baabd192f0bf022536a995bd7f1e5 | treesnapshot (tar.gz zip) |
| parent | 7ef2a31e8a7efa5e0aaec492596ccd56e3d7c884 | commitdiff |
| parent | a7b15a5cc6261629879d4d8a71bacf23f983000b | commitdiff |
Merge commit 'a7b15a5cc6261629879d4d8a71bacf23f983000b' into upstream-merge
* commit 'a7b15a5cc6261629879d4d8a71bacf23f983000b':
Revert "Revert "pci: interrupt disable bit support""
Conflicts:
hw/pci.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit 'a7b15a5cc6261629879d4d8a71bacf23f983000b':
Revert "Revert "pci: interrupt disable bit support""
Conflicts:
hw/pci.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| hw/pci.c | diff1 | diff2 | blobhistory |
| hw/pci.h | diff1 | diff2 | blobhistory |