From: Anthony Liguori Date: Fri, 19 Apr 2013 13:38:16 +0000 (-0500) Subject: Merge remote-tracking branch 'stefanha/trivial-patches' into staging X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f691df528340807d42247fe79a89ea88e6303e1d;p=qmiga%2Fqemu.git Merge remote-tracking branch 'stefanha/trivial-patches' into staging # By Stefan Weil (3) and others # Via Stefan Hajnoczi * stefanha/trivial-patches: m25p80: Remove bogus include of devices.h ssh: Remove unnecessary use of strlen function. block/ssh: Add missing gcc format attributes linux-user: change do_semop to return target errno when unsuccessful w64: Fix compiler warnings (wrong format specifier) Remove unneeded type casts virtio.h: drop unused function prototypes bswap: fix compiler warning Message-id: 1366371241-23430-1-git-send-email-stefanha@redhat.com Signed-off-by: Anthony Liguori --- f691df528340807d42247fe79a89ea88e6303e1d