Merge branch 'drivers-platform' into release
[linux-2.6.git] / drivers / platform / x86 / sony-laptop.c