Merge branch 'linus' into release
[pandora-kernel.git] / drivers / macintosh / therm_windtunnel.c
Simple merge