]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
projects / mirror_ubuntu-eoan-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af209e0 c65b53b)
Merge branch 'spi/for-3.2' of git://git.pengutronix.de/git/wsa/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Dec 2011 22:41:50 +0000 (14:41 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Dec 2011 22:41:50 +0000 (14:41 -0800)
* '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


Trivial merge
Ubuntu Eoan Linux kernel mirror