diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-19 13:36:37 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-19 13:36:37 -0500 |
commit | 49f54371f22e3e95124e8115050cea29fadde606 (patch) | |
tree | dff7144c8c1527b078b0c6735f52f403aa5281cb /vgafont.h | |
parent | be793eb3b9d04ce524cebcffb96e9770d68e57d9 (diff) | |
parent | baa1bd8992c22095fa5a483f4b6415eb15180665 (diff) |
Merge remote-tracking branch 'bonzini/scsi-next' into staging
* bonzini/scsi-next:
scsi: add get_dev_path
virtio-scsi: call unregister_savevm properly
scsi: copy serial number into VPD page 0x83
scsi-cd: check ready condition before processing several commands
get rid of CONFIG_VIRTIO_SCSI
Diffstat (limited to 'vgafont.h')
0 files changed, 0 insertions, 0 deletions