]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'mjt/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 May 2013 13:22:36 +0000 (08:22 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 May 2013 13:22:36 +0000 (08:22 -0500)
commit95de21a430f7bc4166a153b1f69b1425c8a99c7b
treeed0754df09c7e0bd9bafce52cffdd8257a687897
parent3459f01b2d9612070ec23221a4ccb60a41b775ae
parentd2ad50210b35c2685640f7df931a0fccb49334f7
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 <aliguori@us.ibm.com>
include/hw/i386/pc.h