summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-14 23:29:34 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-14 23:29:34 +0200
commitdb973ffa11030e032acde47b4d6e958064311166 (patch)
tree912d103141f625e32ccda709a4b9a854e3a3e696 /drivers/spi
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff)
parentcs5520: disable VDMA (diff)
downloadlinux-db973ffa11030e032acde47b4d6e958064311166.tar.xz
linux-db973ffa11030e032acde47b4d6e958064311166.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: cs5520: disable VDMA ide/Kconfig: couple of fixes alim15x3: remove WDC_ALI15X3 config option alim15x3: add "wdc_udma" module parameter alim15x3: remove stale warning about ATI RS100 northbridge alim15x3: trivial cleanup for ali_set_pio_mode() make ide-iops.c:SELECT_MASK() static SWARM IDE: Fix up following changes to ide_hwif_t
Diffstat (limited to 'drivers/spi')
0 files changed, 0 insertions, 0 deletions