]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 12 Feb 2008 04:42:11 +0000 (20:42 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 12 Feb 2008 04:42:11 +0000 (20:42 -0800)
commita17b7a398d5c20ccbcb11f98dc2a76a6f07934ad
tree8c044501818c13b35bdc45ac5bf3189bfd556deb
parent271cad6d7e91ff8eea18976311692f99cd667ad3
parentfbf14e2f2d674e6a2ff0fb2aa569e7f6687483a3
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_mv: platform driver allocs dma without create
  pata_ninja32: setup changes
  pata_legacy: typo fix
  pata_amd: Note in the module description it handles Nvidia
  sata_mv: fix loop with last port
  libata: ignore deverr on SETXFER if mode is configured
  pata_via: fix SATA cable detection on cx700