From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Dec 2011 22:41:50 +0000 (-0800)
Subject: Merge branch 'spi/for-3.2' of git://git.pengutronix.de/git/wsa/linux-2.6
X-Git-Tag: v3.2-rc5~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e2f4e0bc2aaf41a2b487ef7d2afb76e5c87d466c;p=linux.git

Merge branch 'spi/for-3.2' of git://git.pengutronix.de/git/wsa/linux-2.6

* 'spi/for-3.2' of git://git.pengutronix.de/git/wsa/linux-2.6:
  spi/gpio: fix section mismatch warning
  spi/fsl-espi: disable CONFIG_SPI_FSL_ESPI=m build
  spi/nuc900: Include linux/module.h
  spi/ath79: fix compile error due to missing include
---

e2f4e0bc2aaf41a2b487ef7d2afb76e5c87d466c