]> git.proxmox.com Git - qemu.git/commit - blockdev.c
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f5e7dad 8afaefb)
Merge remote-tracking branch 'stefanha/block' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Aug 2013 13:01:39 +0000 (08:01 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Aug 2013 13:01:39 +0000 (08:01 -0500)
commit56105bd5c0b6d7ac62b34c8b8f496df8f7bd9d92
treefbef641193f8527c10b03289fdf89c5c2a015ee8tree
parentf5e7dad8ee5673b4de1eaa9a2fa610f0940f26b0commit | diff
parent8afaefb8919dc8746a57c450a758717c516c7b0acommit | diff
Merge remote-tracking branch 'stefanha/block' into staging

# By Kevin Wolf
# Via Stefan Hajnoczi
* stefanha/block:
  block: Disable driver-specific options for 1.6

Message-id: 1375461379-20277-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Qemu copy for testing