From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Jan 2011 23:24:37 +0000 (-0800)
Subject: Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.0~2071
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8473dbb43db92fa8de7c24d1973aaf1e0276a89f;p=platform%2Fkernel%2Flinux-amlogic.git

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

8473dbb43db92fa8de7c24d1973aaf1e0276a89f