| commit | db973ffa11030e032acde47b4d6e958064311166 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 14 May 2008 21:29:34 +0000 (14 14:29 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 14 May 2008 21:29:34 +0000 (14 14:29 -0700) | ||
| tree | 912d103141f625e32ccda709a4b9a854e3a3e696 | treesnapshot (tar.gz zip) |
| parent | dd286422fefdcff784e8d336deeb88ce817e14db | commitdiff |
| parent | cafa027b8cc6f605ccebc43a960644307a12d8dd | commitdiff |
Merge git://git./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
* 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