Google Git
Sign in
qemu / qemu / acc95bc85036c443da8bf7159a77edf9f00dcd80
commitacc95bc85036c443da8bf7159a77edf9f00dcd80[log] [tgz]
authorMichael S. Tsirkin <mst@redhat.com>Thu Jan 11 22:01:17 2018 +0200
committerMichael S. Tsirkin <mst@redhat.com>Thu Jan 11 22:03:50 2018 +0200
tree21965c6e60a2e29664b7685e52feacdb6a86e0bd
parent880b1ffe6ec2f0ae25cc4175716227ad275e8b8a [diff]
parent997eba28a3ed5400a80f754bf3a1c8044b75b9ff [diff]
Merge remote-tracking branch 'origin/master' into HEAD

Resolve conflicts around apb.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
tree: 21965c6e60a2e29664b7685e52feacdb6a86e0bd
  1. accel/
  2. audio/
  3. backends/
  4. block/
  5. bsd-user/
  6. chardev/
  7. contrib/
  8. crypto/
  9. default-configs/
  10. disas/
  11. docs/
  12. fpu/
  13. fsdev/
  14. gdb-xml/
  15. hw/
  16. include/
  17. io/
  18. libdecnumber/
  19. linux-headers/
  20. linux-user/
  21. migration/
  22. nbd/
  23. net/
  24. pc-bios/
  25. po/
  26. qapi/
  27. qga/
  28. qobject/
  29. qom/
  30. replay/
  31. roms/
  32. scripts/
  33. scsi/
  34. slirp/
  35. stubs/
  36. target/
  37. tcg/
  38. tests/
  39. trace/
  40. ui/
  41. util/
  42. capstone
  43. dtc
  44. .dir-locals.el
  45. .editorconfig
  46. .exrc
  47. .gdbinit
  48. .gitignore
  49. .gitmodules
  50. .mailmap
  51. .shippable.yml
  52. .travis.yml
  53. arch_init.c
  54. balloon.c
  55. block.c
  56. blockdev-nbd.c
  57. blockdev.c
  58. blockjob.c
  59. bootdevice.c
  60. bt-host.c
  61. bt-vhci.c
  62. Changelog
  63. CODING_STYLE
  64. configure
  65. COPYING
  66. COPYING.LIB
  67. COPYING.PYTHON
  68. cpus-common.c
  69. cpus.c
  70. device-hotplug.c
  71. device_tree.c
  72. disas.c
  73. dma-helpers.c
  74. dump.c
  75. exec.c
  76. gdbstub.c
  77. HACKING
  78. hmp-commands-info.hx
  79. hmp-commands.hx
  80. hmp.c
  81. hmp.h
  82. ioport.c
  83. iothread.c
  84. LICENSE
  85. MAINTAINERS
  86. Makefile
  87. Makefile.objs
  88. Makefile.target
  89. memory.c
  90. memory_ldst.inc.c
  91. memory_mapping.c
  92. module-common.c
  93. monitor.c
  94. numa.c
  95. os-posix.c
  96. os-win32.c
  97. qapi-schema.json
  98. qdev-monitor.c
  99. qdict-test-data.txt
  100. qemu-bridge-helper.c
  101. qemu-doc.texi
  102. qemu-ga.texi
  103. qemu-img-cmds.hx
  104. qemu-img.c
  105. qemu-img.texi
  106. qemu-io-cmds.c
  107. qemu-io.c
  108. qemu-keymap.c
  109. qemu-nbd.c
  110. qemu-nbd.texi
  111. qemu-option-trace.texi
  112. qemu-options-wrapper.h
  113. qemu-options.h
  114. qemu-options.hx
  115. qemu-seccomp.c
  116. qemu-tech.texi
  117. qemu.nsi
  118. qemu.sasl
  119. qmp.c
  120. qtest.c
  121. README
  122. replication.c
  123. replication.h
  124. rules.mak
  125. thunk.c
  126. tpm.c
  127. trace-events
  128. VERSION
  129. version.rc
  130. vl.c