Merge branch 'spi/merge' into spi/next
[linux-2.6.git] / drivers / spi / spi-bfin5xx.c