[LinuxPPS] 10 May 01:52 - Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik ...

[linuxpps: Linus Torvalds <>]

Merge branch 'upstream-linus' of /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  
  
Documentation/kernel-parameters.txt  
drivers/ata/libata-acpi.c  
drivers/ata/libata-core.c  
drivers/ata/pata_pcmcia.c  
drivers/ata/pata_qdi.c  
drivers/ata/pata_scc.c  
drivers/ata/sata_nv.c  
drivers/ata/sata_promise.c  
drivers/ata/sata_via.c

URL: http://gitweb.enneenne.com/?p=linuxpps;a=commit;h=0a09d9a49cc4a7f65b76f848821d4a8bb7cc1230