projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
# 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>

Trivial merge
Domain: SDK / Emulator;