]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 22 Jan 2007 19:30:47 +0000 (11:30 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 22 Jan 2007 19:30:47 +0000 (11:30 -0800)
commitab1127823b757ec945a048c3385eb1f99a459823
tree80bc28b5d6b4f1091f82da3d631200dd982b20b9
parent365bbe0d0caaf2ba74d56556827babf0bc66965d
parente93f09dc2d49d8e98818a93ad17f3ede91533738
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_mv HighPoint 2310 support (88SX7042)
  libata: fix handling of port actions in per-dev action mask
  libata: initialize qc->dma_dir to DMA_NONE
  sata_via: add PCI ID 0x5337
  libata doc: "error : unterminated entity reference exceptions"