Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

Browse source

* 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
  spi/amba-pl022: fixing compilation warning.
  spi: Enable SPI driver for S5P6440 and S5P6450
  mmc: sdhci-of: fix build on non-powerpc platforms
  spi/imx: Add i.MX53 support
  spi/dw_spi: don't treat NULL clk as an error
  spi: tegra: don't treat NULL clk as an error

...

This commit is contained in:

Linus Torvalds 2011-01-14 15:24:37 -08:00

parent 7cb3920a65 94a1b6d8eb

commit 8473dbb43d

6 changed files with 24 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

drivers/mmc/host/sdhci-of-core.c

View file

8

drivers/spi/Kconfig

View file

2

drivers/spi/amba-pl022.c

View file

5

drivers/spi/dw_spi_mmio.c

View file

6

drivers/spi/spi_imx.c

View file

2

drivers/spi/spi_tegra.c

View file