summary refs log tree commit diff stats
path: root/crypto/cipher.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-19 13:43:58 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-19 13:43:58 +0100
commit6d60e295ef020759a03b90724d0342012c189ba2 (patch)
treea50bcfd74adef238653a7927f6d9c4873225b81e /crypto/cipher.c
parent988879b66ed8dfd1055492d36188f6c10c268644 (diff)
parentff0ca962345ecdb87c331888a806cde49936fd9f (diff)
downloadfocaccia-qemu-6d60e295ef020759a03b90724d0342012c189ba2.tar.gz
focaccia-qemu-6d60e295ef020759a03b90724d0342012c189ba2.zip
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Tue 18 Jul 2017 17:11:07 BST
# gpg:                using RSA key 0x7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jnsnow/tags/ide-pull-request:
  tests/ahci-test: Be mean with RAM
  ahci: split public and private interface
  ahci: Isolate public AHCI interface
  ahci: add ahci_get_num_ports

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