tree 33e02db84c7a9232ca775fd12e52bb9a2e37a7cc
parent af209e0aea2b1a6216c728decfaa231f587b8c2b
parent c65b53ba4f9ca4520078bab23099579da3bf0446
author Linus Torvalds <torvalds@linux-foundation.org> 1323470510 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1323470510 -0800

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