summary refs log tree commit diff stats
path: root/hw/usb/dev-smartcard-reader.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-07-22 10:13:49 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-07-22 10:13:49 -0500
commita20bd9eec3cf3f9dd7e27d45a96d7b1b9ab09ebd (patch)
treee73da41eb2e8ae610bee6bc624ca55cf98486e96 /hw/usb/dev-smartcard-reader.c
parent5447a9afc4150693d3909a8632891061147e170d (diff)
parentbe022d61f4938bb051e8af8e6cb470ec1602c488 (diff)
downloadfocaccia-qemu-a20bd9eec3cf3f9dd7e27d45a96d7b1b9ab09ebd.tar.gz
focaccia-qemu-a20bd9eec3cf3f9dd7e27d45a96d7b1b9ab09ebd.zip
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Michael Tokarev (2) and others
# Via Michael Tokarev
* mjt/trivial-patches:
  doc: monitor multiplexing rewording
  block/m25p80: Update Micron entries
  Fix command example in qemu.sasl
  slirp: remove mbuf(m_hdr,m_dat) indirection
  linux-user: declare sys_futex to have 6 arguments

Message-id: 1374225073-12959-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/usb/dev-smartcard-reader.c')
0 files changed, 0 insertions, 0 deletions