projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97e130f c7582ff)
Merge branch 'ib-pdx86-properties'
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 20 Apr 2020 15:34:20 +0000 (18:34 +0300)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 20 Apr 2020 15:34:20 +0000 (18:34 +0300)
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>

Trivial merge