diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-29 12:12:33 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-29 12:12:33 +0100 |
| commit | 47dac82d8b013a5c7dd044a797ae6727b553959a (patch) | |
| tree | 8d8d6eaaf5bfa488b200a9740a8cf51c8ec8eda3 /hw/intc/s390_flic.c | |
| parent | 849880978eb2d9043323e34afb46eae8772a5fc6 (diff) | |
| parent | d208c50d9dbf98c0eca337723cd6497653ceb743 (diff) | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
vvfat fixes for 2.6.0-rc4
# gpg: Signature made Fri 29 Apr 2016 10:52:13 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
vvfat: Fix default volume label
vvfat: Fix volume name assertion
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/intc/s390_flic.c')
0 files changed, 0 insertions, 0 deletions