diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 20:54:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 20:54:09 +0200 |
| commit | b171aa27700c78511086a759383b033949c9d7f0 (patch) | |
| tree | 2775b0682ea342dd49c5b997de248da73ec83049 /net | |
| parent | mm: fix page table unmap for stack guard page properly (diff) | |
| parent | spi/amba_pl022: Fix probe and remove hook section annotations. (diff) | |
| download | linux-b171aa27700c78511086a759383b033949c9d7f0.tar.xz linux-b171aa27700c78511086a759383b033949c9d7f0.zip | |
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
spi/amba_pl022: Fix probe and remove hook section annotations.
spi/mpc5121: change annotations for probe and remove functions
spi/bitbang: reinitialize transfer parameters for every message
spi/spi-gpio: add support for controllers without MISO or MOSI pin
spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes
SPI100k: Fix 8-bit and RX-only transfers
spi/mmc_spi: mmc_spi adaptations for SPI bus locking API
spi/mmc_spi: SPI bus locking API, using mutex
Fix trivial conflict in drivers/spi/mpc512x_psc_spi.c due to 'struct
of_device' => 'struct platform_device' rename and __init/__exit to
__devinit/__devexit fix.
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions