]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge branch 'trivial-patches' of git://github.com/stefanha/qemu
authorAurelien Jarno <aurelien@aurel32.net>
Sat, 6 Oct 2012 16:54:14 +0000 (18:54 +0200)
committerAurelien Jarno <aurelien@aurel32.net>
Sat, 6 Oct 2012 16:54:14 +0000 (18:54 +0200)
* 'trivial-patches' of git://github.com/stefanha/qemu:
  versatilepb: Use symbolic indices for ARM PIC
  qdev: kill bogus comment
  qemu-barrier: Fix compiler version check for future gcc versions
  hw: Add missing 'static' attribute for QEMUMachine
  cleanup useless return sentence
  qemu-sockets: Fix compiler warning (regression for MinGW)
  vnc: Fix spelling (hellmen -> hellman) in comment
  slirp: Fix spelling in comment (enought -> enough, insure -> ensure)
  tcg/arm: Use tcg_out_mov_reg rather than inline equivalent code
  cpu: Add missing 'static' attribute to qemu_global_mutex
  configure: Support empty target list (--target-list=)
  hw: Fix return value check for bdrv_read, bdrv_write

1  2 
configure
hw/bt-hci.c
hw/qdev.c
libcacard/vcard_emul_nss.c
os-posix.c
qga/commands-posix.c
tcg/arm/tcg-target.c
ui/vnc-auth-sasl.c
vl.c

diff --cc configure
Simple merge
diff --cc hw/bt-hci.c
Simple merge
diff --cc hw/qdev.c
Simple merge
Simple merge
diff --cc os-posix.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc vl.c
Simple merge