From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Feb 2012 03:05:47 +0000 (-0800)
Subject: Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4a68d54c983514f123e99fc720951a4ee4d84270;p=~shefty%2Frdma-dev.git

Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6

SPI bug fixes for v3.3-rc2

Minor SPI device driver changes.  A rename of the pch_spi_pcidev symbol
that merely eliminates a modpost warning, and a Kconfig change to allow
the Samsung spi driver to build on EXYNOS.

* tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  spi-topcliff-pch: rename pch_spi_pcidev to pch_spi_pcidev_driver
  spi: Add spi-s3c64xx driver dependency on ARCH_EXYNOS4
---

4a68d54c983514f123e99fc720951a4ee4d84270