Merge branch 'master' into upstream
[pandora-kernel.git] / drivers / spi / spi.c
Simple merge