tree 50839e8c1d52c7c5fcd93fab6ad5a81b59135cff
parent 44ce6294d07555c3d313757105fd44b78208407f
parent e0863397cb8f3ede356ef2cb7dcdccc9956cdc6d
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1178761965 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1178761965 -0700

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:
  Doc Fix: remove mention of combined mode-related kernel parameters
  libata: fix kernel-doc parameters
  Fix pata_qdi.c probe code
  pata_scc: fix compilation
  sata_via: add missing PM hooks
  sata_nv: fix ADMA freeze/thaw/irq_clear issues
  pata_pcmcia.c: add card ident for jvc cdrom
  sata_promise: SATAII-150/300 TX4 port numbering fix
  sata_promise: fix another error decode regression
  libata-acpi: fix _GTF command protocol for ATAPI devices