• Linus Torvalds's avatar
    Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 · 7235dd74
    Linus Torvalds authored
    * 'spi/next' of git://git.secretlab.ca/git/linux-2.6: (34 commits)
      spi/imx: add device tree probe support
      spi/imx: copy gpio number passed by platform data into driver private data
      spi/imx: use soc name in spi device type naming scheme
      spi/imx: merge type SPI_IMX_VER_0_7 into SPI_IMX_VER_0_4
      spi/imx: do not use spi_imx2_3 to name SPI_IMX_VER_2_3 function and macro
      spi/imx: use mx21 to name SPI_IMX_VER_0_0 function and macro
      spi/imx: do not make copy of spi_imx_devtype_data
      spi/dw: Add spi number into spi irq desc
      spi/tegra: Use engineering names in DT compatible property
      spi/fsl_spi: fix CPM spi driver
      mach-s3c2410: remove unused spi-gpio.h file
      spi: remove obsolete spi-s3c24xx-gpio driver
      mach-gta2: remove unused spi-gpio.h include
      mach-qt2410: convert to spi_gpio
      mach-jive: convert to spi_gpio
      spi/pxa2xx: Remove unavailable ssp_type from documentation
      spi/bfin_spi: uninline fat queue funcs
      spi/bfin_spi: constify pin array
      spi/bfin_spi: use structs for accessing hardware regs
      spi/topcliff-pch: Support new device ML7223 IOH
      ...
    
    Fix up trivial conflict in arch/arm/mach-ep93xx/Makefile
    7235dd74
core.c 24.5 KB