Skip to content
Commit f7ea285b authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parents 97e130f6 c7582ff7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment