]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aa6f14f 6887036)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 May 2008 21:29:34 +0000 (14:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 May 2008 21:29:34 +0000 (14:29 -0700)
commitc8c577fec709a365cb3603227d23651fdc82db65
tree912d103141f625e32ccda709a4b9a854e3a3e696tree | snapshot
parentaa6f14f01d87dd0f20e11f81e8451961dc0324a9commit | diff
parent68870361fef5425d14000cf0ebfc30cd6f01b5bbcommit | diff
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
Linux Kernel Source Tree.