Merge branch 'drivers-platform' into release
[sfrench/cifs-2.6.git] / drivers / platform / x86 / tc1100-wmi.c