tree 3fca0a8ab3cea5c41098e0f04fae690cce38f70e
parent 7cb3920a6529df7f54487abe973b903b8239e901
parent 94a1b6d8eb903818773ad24fe48529b0d295052d
author Linus Torvalds <torvalds@linux-foundation.org> 1295047477 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1295047477 -0800

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

* '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