summaryrefslogtreecommitdiff
path: root/drivers/cdrom/cdrom.c
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2013-05-01 10:16:50 +0400
committerMichael S. Tsirkin <mst@redhat.com>2013-05-01 10:16:50 +0400
commitbc7562355fda8075793bf66094cda573206ec693 (patch)
tree164ead72687e6f73daad2870741afcce07ca7e70 /drivers/cdrom/cdrom.c
parentc39904a0ac22cf05f5f44226457f6da0fe65457e (diff)
parentb8d26b3be8b33682cf163274ed07479a70554633 (diff)
downloadlinux-bc7562355fda8075793bf66094cda573206ec693.tar.xz
Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending into vhost-net-next
Diffstat (limited to 'drivers/cdrom/cdrom.c')
0 files changed, 0 insertions, 0 deletions