From: Anthony Liguori Date: Wed, 22 May 2013 13:22:36 +0000 (-0500) Subject: Merge remote-tracking branch 'mjt/trivial-patches' into staging X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=95de21a430f7bc4166a153b1f69b1425c8a99c7b;p=qmiga%2Fqemu.git Merge remote-tracking branch 'mjt/trivial-patches' into staging # By Christophe Lyon (1) and others # Via Michael Tokarev * mjt/trivial-patches: target-moxie: replace target_phys_addr_t with hwaddr Rename hexdump to avoid FreeBSD libutil conflict remove some double-includes translate: remove redundantly included qemu/timer.h Remove twice include of qemu-common.h fix /proc/self/maps output Message-id: 51977B44.1000302@msgid.tls.msk.ru Signed-off-by: Anthony Liguori --- 95de21a430f7bc4166a153b1f69b1425c8a99c7b