• Linus Torvalds's avatar
    Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 · b171aa27
    Linus Torvalds authored
    * 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
      spi/amba_pl022: Fix probe and remove hook section annotations.
      spi/mpc5121: change annotations for probe and remove functions
      spi/bitbang: reinitialize transfer parameters for every message
      spi/spi-gpio: add support for controllers without MISO or MOSI pin
      spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes
      SPI100k: Fix 8-bit and RX-only transfers
      spi/mmc_spi: mmc_spi adaptations for SPI bus locking API
      spi/mmc_spi: SPI bus locking API, using mutex
    
    Fix trivial conflict in drivers/spi/mpc512x_psc_spi.c due to 'struct
    of_device' => 'struct platform_device' rename and __init/__exit to
    __devinit/__devexit fix.
    b171aa27
mpc512x_psc_spi.c 14 KB