git.ipfire.org Git - thirdparty/qemu.git/commitdiff

author	Anthony Liguori <aliguori@us.ibm.com>
	Wed, 22 May 2013 13:22:36 +0000 (08:22 -0500)
committer	Anthony Liguori <aliguori@us.ibm.com>
	Wed, 22 May 2013 13:22:36 +0000 (08:22 -0500)

# 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 <aliguori@us.ibm.com>

		1	2
include/hw/i386/pc.h	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge