Merge branch 'drivers-platform' into release
Conflicts:
drivers/misc/Kconfig
Signed-off-by: Len Brown <len.brown@intel.com>
Showing
drivers/platform/Kconfig
0 → 100644
drivers/platform/Makefile
0 → 100644
drivers/platform/x86/Kconfig
0 → 100644
File moved
File moved
Please register or sign in to comment