From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 1 Feb 2013 01:37:23 +0000 (-0600)
Subject: Merge remote-tracking branch 'afaerber-or/cocoa-for-upstream' into staging
X-Git-Tag: pull-nvme-20200902~6635
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2854c549e84532f0b76b7884f1903da8a1bf4dbb;p=qemu-nvme.git

Merge remote-tracking branch 'afaerber-or/cocoa-for-upstream' into staging

# By Henry Harrington (1) and Stefan Weil (1)
# Via Andreas Färber
* afaerber-or/cocoa-for-upstream:
  cocoa: Replace non-portable asprintf() by g_strdup_printf()
  cocoa: Fix VBE function Set Display Start
---

2854c549e84532f0b76b7884f1903da8a1bf4dbb