diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-09 23:41:50 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-09 23:41:50 +0100 |
| commit | e2f4e0bc2aaf41a2b487ef7d2afb76e5c87d466c (patch) | |
| tree | 33e02db84c7a9232ca775fd12e52bb9a2e37a7cc /block/blk-cgroup.c | |
| parent | Merge branch 'for-linus' of git://neil.brown.name/md (diff) | |
| parent | spi/gpio: fix section mismatch warning (diff) | |
| download | linux-e2f4e0bc2aaf41a2b487ef7d2afb76e5c87d466c.tar.xz linux-e2f4e0bc2aaf41a2b487ef7d2afb76e5c87d466c.zip | |
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
Diffstat (limited to 'block/blk-cgroup.c')
0 files changed, 0 insertions, 0 deletions