Merge branch 'drivers-platform' into release

[linux-2.6-omap-h63xx.git] / drivers / platform / x86 / thinkpad_acpi.c

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