| commit | 6249f61a891b6b003531ca4e459c3a553faa82bc | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 24 Feb 2010 18:58:42 +0000 (24 15:58 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 24 Feb 2010 18:58:42 +0000 (24 15:58 -0300) | ||
| tree | b44383d4a41f55ea5e99d828fad6c0651d9966fc | treesnapshot (tar.gz zip) |
| parent | 73b0a125d3ea193713853210080e16bacf625f36 | commitdiff |
| parent | f3dfda6114fd12ca7caac456b1997962b5c48274 | commitdiff |
Merge commit 'f3dfda6114fd12ca7caac456b1997962b5c48274' into upstream-merge
* commit 'f3dfda6114fd12ca7caac456b1997962b5c48274':
use eventfd for iothread
Conflicts:
osdep.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit 'f3dfda6114fd12ca7caac456b1997962b5c48274':
use eventfd for iothread
Conflicts:
osdep.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| osdep.c | diff1 | diff2 | blobhistory |
| vl.c | diff1 | diff2 | blobhistory |