diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-10 03:52:45 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-10 03:52:45 +0200 |
commit | 0a09d9a49cc4a7f65b76f848821d4a8bb7cc1230 (patch) | |
tree | 50839e8c1d52c7c5fcd93fab6ad5a81b59135cff /drivers/usb/net/zaurus.c | |
parent | Revert "md: improve partition detection in md array" (diff) | |
parent | Doc Fix: remove mention of combined mode-related kernel parameters (diff) | |
download | linux-0a09d9a49cc4a7f65b76f848821d4a8bb7cc1230.tar.xz linux-0a09d9a49cc4a7f65b76f848821d4a8bb7cc1230.zip |
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
Diffstat (limited to 'drivers/usb/net/zaurus.c')
0 files changed, 0 insertions, 0 deletions