summary refs log tree commit diff stats
path: root/hw/intc/lm32_pic.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-01-11 11:52:40 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-01-11 11:52:40 +0000
commit612061b277915fadd80631eb7a6926f48a110c44 (patch)
treed71b14126b4a3be5bb96e68a7a2baabd9f480210 /hw/intc/lm32_pic.c
parent7642f96e6015ea0c6a8334f8e36f824f70378b5d (diff)
parent420a4e955909788263a33d11600839e93480dfd3 (diff)
downloadfocaccia-qemu-612061b277915fadd80631eb7a6926f48a110c44.tar.gz
focaccia-qemu-612061b277915fadd80631eb7a6926f48a110c44.zip
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-01-10' into staging
nbd patches for 2018-01-10

- Vladimir Sementsov-Ogievskiy: nbd: rename nbd_option and nbd_opt_reply
- Vladimir Sementsov-Ogievskiy: nbd/server: add additional assert to nbd_export_put

# gpg: Signature made Wed 10 Jan 2018 22:53:49 GMT
# gpg:                using RSA key 0xA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>"
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
# gpg:                 aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2018-01-10:
  nbd: rename nbd_option and nbd_opt_reply
  nbd/server: add additional assert to nbd_export_put

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/intc/lm32_pic.c')
0 files changed, 0 insertions, 0 deletions