From: Anthony Liguori Date: Fri, 6 Dec 2013 20:52:50 +0000 (-0800) Subject: Merge remote-tracking branch 'mjt/trivial-patches' into staging X-Git-Tag: v2.0.0-rc0~204 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=783eb67e7a125eaf226e5ea4f5df97c1ea42311e;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'mjt/trivial-patches' into staging # By Stefan Weil (9) and others # Via Michael Tokarev * mjt/trivial-patches: eeprom93xx: fix coding style hw/ppc/mac.h: remove unused BIOS_FILENAME definition Don't crash on keyboard input with no handler libcacard/vcard_emul_nss: Remove unused statement (value stored is never read) libcacard/cac: Remove unused statement (value stored is never read) virtio-net: fix the indent misc: Replace 'struct QEMUTimer' by 'QEMUTimer' qobject: Fix compiler warning (missing gnu_printf format attribute) acpi-build: Fix compiler warning (missing gnu_printf format attribute) .gitignore: Ignore config.status gtk: Replace conditional debug messages by trace methods console: Replace conditional debug messages by trace methods trace: Remove trace.h from hw/usb/hcd-ehci.h (less dependencies) trace: Remove trace.h from console.h (less dependencies) Message-id: 1385408466-13183-1-git-send-email-mjt@msgid.tls.msk.ru Signed-off-by: Anthony Liguori --- 783eb67e7a125eaf226e5ea4f5df97c1ea42311e