From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Mon, 20 Apr 2020 15:34:20 +0000 (+0300)
Subject: Merge branch 'ib-pdx86-properties'
X-Git-Tag: block-5.8-2020-06-11~26^2~60
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f7ea285b6266822bd63af2a3695f03e3357fd74f;p=linux-block.git

Merge branch 'ib-pdx86-properties'

Merge branch 'ib-pdx86-properties' of
git://git.infradead.org/linux-platform-drivers-x86.git
to avoid conflicts in PDx86.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---

f7ea285b6266822bd63af2a3695f03e3357fd74f