summary refs log tree commit diff stats
path: root/hw/timer/imx_timer.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-05-03 11:20:07 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-05-03 11:20:07 -0500
commita612925b4184fa7aa37092db4fef816030640922 (patch)
tree82e8aaa8575caba5750468fe6b28e400f5add008 /hw/timer/imx_timer.c
parent25565e8595322b04902a09ebf877d80532f22fd1 (diff)
parent7873df408dd44eb92840b108211d5aa5db7db526 (diff)
downloadfocaccia-qemu-a612925b4184fa7aa37092db4fef816030640922.tar.gz
focaccia-qemu-a612925b4184fa7aa37092db4fef816030640922.zip
Merge remote-tracking branch 'stefanha/net' into staging
# By Amos Kong (1) and Jason Wang (1)
# Via Stefan Hajnoczi
* stefanha/net:
  tap: properly initialize vhostfds
  net: make network client name unique

Message-id: 1367582254-15060-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/timer/imx_timer.c')
0 files changed, 0 insertions, 0 deletions