]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Jun 2012 20:09:47 +0000 (15:09 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Jun 2012 20:09:47 +0000 (15:09 -0500)
* stefanha/trivial-patches:
  tci: Support INDEX_op_bswap64_i64
  target-i386: Use QEMU instead of Qemu
  Makefile.hw: avoid overly large 'make clean' rm command
  configure: Fix typo
  arm_gic: Send dbg msgs to stderr not stdout
  checkpatch: Add QEMU specific rule
  qemu-config: Use QEMU instead of Qemu
  libqtest: Fix socket_accept() to pass address_len
  Makefile.user: Define CONFIG_USER_ONLY for libuser/
  Makefile: Remove macro qapi-dir
  Makefile: Remove BUILD_DIR from qapi-dir
  Install 'bepo' keymap already included in Qemu source

1  2 
Makefile
configure
hw/arm_gic.c

diff --cc Makefile
Simple merge
diff --cc configure
Simple merge
diff --cc hw/arm_gic.c
Simple merge