Merge branch 'drivers-platform' into release

[~andy/linux] / drivers / platform / x86 / tc1100-wmi.c

diff --git a/drivers/misc/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c
similarity index 100%
rename from drivers/misc/tc1100-wmi.c
rename to drivers/platform/x86/tc1100-wmi.c