summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/stable-0.15' into stable-0.15qemu-kvm-0.15.0Avi Kivity2011-08-091-1/+3
|\
| * Makefile: add missing deps on $(GENERATED_HEADERS)Michael Roth2011-07-311-1/+3
* | Merge remote-tracking branch 'upstream/stable-0.15' into stable-0.15Avi Kivity2011-07-311-6/+6
|\|
| * Let users select their pythonsBlue Swirl2011-07-251-6/+6
* | Merge commit '6141dbfe0a595076310f690ec8db84ad5be2cde5' into upstream-mergeAvi Kivity2011-07-271-4/+39
|\|
| * guest agent: add guest agent RPCs/commandsMichael Roth2011-07-211-3/+13
| * guest agent: qemu-ga daemonMichael Roth2011-07-211-3/+5
| * guest agent: command state classMichael Roth2011-07-211-1/+3
| * qapi: add test-qmp-commands, tests for gen. marshalling/dispatch codeMichael Roth2011-07-211-1/+7
| * qapi: add test-visitor, tests for gen. visitor codeMichael Roth2011-07-211-2/+17
* | Merge commit 'e18df14185e817ba735bce57ecdef9a55fb3d093' into upstream-mergeAvi Kivity2011-07-271-0/+2
|\|
| * Add hard build dependency on glibAnthony Liguori2011-07-211-0/+2
* | Merge commit 'eb47d7c5d96060040931c42773ee07e61e547af9' into upstream-mergeAvi Kivity2011-06-191-1/+19
|\|
| * libcacard: add libcacard.la targetAlon Levy2011-06-141-1/+19
* | Merge commit '924f766af9be3ff036a419fc85ed740aa01f8eac' into upstream-mergeAvi Kivity2011-06-091-2/+3
|\|
| * json-parser: propagate error from parserAnthony Liguori2011-06-071-2/+2
| * PPC: install mpc8544ds.dtbAlexander Graf2011-06-031-0/+1
* | Merge commit '6774e44ae3bfe074f59a16ffb0b52ae441b9c66d' into upstream-mergeAvi Kivity2011-05-151-0/+2
|\|
| * libcacard: add correct subdirectory dependenciesPaolo Bonzini2011-05-081-0/+2
| * Merge remote-tracking branch 'awilliam/ipxe' into stagingAnthony Liguori2011-04-251-8/+8
| |\
* | \ Merge commit '5ee8ad71e159e724e2fa1af6b2c502668179502a' into upstream-mergeMarcelo Tosatti2011-05-031-8/+8
|\ \ \ | | |/ | |/|
| * | PXE: Use consistent naming for PXE ROMsAlex Williamson2011-04-181-8/+8
* | | Merge commit '3110e2925489c571901e945e315942ce84fe696f' into upstream-mergeMarcelo Tosatti2011-05-031-1/+4
|\ \ \ | | |/ | |/|
| * | Makefile: Clean up after "make pdf"Brad Hards2011-04-161-1/+4
| |/
* | Merge commit '23910d3f669d46073b403876e30a7314599633af' into upstream-mergeMarcelo Tosatti2011-04-151-34/+4
|\|
| * libcacard: initial commitRobert Relyea2011-04-011-2/+4
| * trace: move trace objects from Makefile to Makefile.objsAlon Levy2011-04-011-32/+0
* | Merge commit 'a9f8ad8f2acdb2398da5d32a5efc19cb0196d79f' into upstream-mergeMarcelo Tosatti2011-04-141-1/+1
|\|
| * Add SLOF-based partition firmware for pSeries machine, allowing more boot opt...David Gibson2011-04-011-1/+1
* | Merge commit '39ac8455106af1ed669b8e10223420cf1ac5b190' into upstream-mergeMarcelo Tosatti2011-04-141-1/+2
|\|
| * Implement hcall based RTAS for pSeries machinesDavid Gibson2011-04-011-1/+2
* | Merge commit 'ca22a3a3758ee7ab14166058d4ce36bc6cdfdfd8' into upstream-mergeMarcelo Tosatti2011-04-141-1/+1
|\|
| * microblaze: Add PetaLogix ml605 MMU little-endian ref designMichal Simek2011-03-161-1/+1
* | Merge commit 'b947c12c0bb217fe09968e652873e0d22b269d68' into upstream-mergeMarcelo Tosatti2011-01-211-13/+13
|\|
| * Add scripts directoryBlue Swirl2011-01-201-13/+13
* | Merge commit 'a19cbfb346425cc760ed19b4e746417df636b761' into upstream-mergeMarcelo Tosatti2011-01-061-1/+1
|\|
| * spice: add qxl vgabios binary.Gerd Hoffmann2010-12-091-1/+1
* | Merge commit '2507c12ab026b2286b0a47035c629f3d568c96f4' into upstream-mergeMarcelo Tosatti2011-01-061-1/+0
|\|
| * Merge remote branch 'origin/master' into pciMichael S. Tsirkin2010-12-011-14/+41
| |\
| * | eepro100: Use a single rom file for all i825xx devicesStefan Weil2010-11-221-1/+0
* | | Merge commit '661a1799ba6544a54888283db19dd51469da01e5' into upstream-mergeMarcelo Tosatti2011-01-061-6/+7
|\ \ \ | | |/ | |/|
| * | Include directives in default configsPaul Brook2010-11-261-5/+6
| * | Add missing dependency.Paul Brook2010-11-261-1/+1
* | | Merge commit 'f711df67d611e4762966a249742a5f7499e19f99' into upstream-mergeMarcelo Tosatti2010-12-021-6/+31
|\| |
| * | Makefile: Fix check dependency breakageLuiz Capitulino2010-11-211-6/+8
| * | Add a DTrace tracing backend targetted for SystemTAP compatabilityDaniel P. Berrange2010-11-211-0/+23
| * | Revert "Add a DTrace tracing backend targetted for SystemTAP compatability"Anthony Liguori2010-11-211-23/+0
| * | Add a DTrace tracing backend targetted for SystemTAP compatabilityDaniel P. Berrange2010-11-161-0/+23
* | | Merge commit '3b3d448e01ccfc6fdcb6e3d4ebf47418075e3bb4' into upstream-mergeMarcelo Tosatti2010-12-021-2/+3
|\| |
| * | Add new vgabios binaries to blobs list.Gerd Hoffmann2010-11-161-2/+3
| |/