From: Peter Maydell Date: Tue, 13 Sep 2016 16:55:35 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging X-Git-Tag: TizenStudio_2.0_p2.3.2~9^2~14^2~5^2~192 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=507e4ddc3abf67391bcbc9624fd60b969c159b78;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging trivial patches for 2016-09-13 # gpg: Signature made Tue 13 Sep 2016 16:53:11 BST # gpg: using RSA key 0x701B4F6B1A693E59 # gpg: Good signature from "Michael Tokarev " # gpg: aka "Michael Tokarev " # gpg: aka "Michael Tokarev " # Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5 # Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59 * remotes/mjt/tags/trivial-patches-fetch: hw/net/e1000e: Fix compiler warning target-m68k: fix get_mac_extf helper timer/cpus: fix some typos and update some comments timer.h: fix inconsistency between comment and function prototype timer.h: fix typo maint: Ignore generated version file Document that curses usually needs -k option too trace-event: display "%d" instead of "0x%d" linux-user, trivial: display "0x%x" instead of "0x%d" pic: fix typo in error message: KVM_GET_IRQCHIP -> KVM_SET_IRQCHIP sparc: Use g_memdup() instead of g_new0() + memcpy() vl: remove unnecessary duplicate call to tpm_cleanup arm: spelling fix: mismatch hw/dma/omap: spelling fix: endianness hw/bt/hci: spelling fix: endianness docs: Fix description of the leaky bucket algorithm in throttle.txt Signed-off-by: Peter Maydell --- 507e4ddc3abf67391bcbc9624fd60b969c159b78