summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '2f7bb8780af4a007e90045b4cc97f558e956adf9' into upstream-mergeAvi Kivity2009-07-291-1/+1
|\
| * rename USE_NPTL to CONFIG_USE_NPTLJuan Quintela2009-07-271-1/+1
* | Merge commit '0ba99fc6a188988f11361cb41eba7c1afce346d4' into upstream-mergeAvi Kivity2009-07-281-2/+1
|\ \ | |/
| * Update to a hopefully more future proof FSF addressBlue Swirl2009-07-161-2/+1
* | Merge branch 'qemu-cvs'Avi Kivity2009-01-181-1/+1
|\ \ | |/
| * Remove all traces of __powerpc__malc2009-01-141-1/+1
* | Merge branch 'qemu-cvs'Avi Kivity2009-01-051-1/+1
|\ \ | |/
| * Update FSF address in GPL/LGPL boilerplateaurel322009-01-041-1/+1
* | Merge branch 'qemu-cvs'Avi Kivity2008-11-231-4/+3
|\ \ | |/
| * AIX's assembler does not support local labels, use relative addressing insteadmalc2008-11-181-4/+3
* | Merge branch 'qemu-cvs'Avi Kivity2008-06-251-2/+2
|/
* Multithreaded locking fixes.pbrook2008-06-071-0/+249