diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-01 19:48:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-01 19:48:21 -0800 |
| commit | 562aa1d4c6a874373f9a48ac184f662fbbb06a04 (patch) | |
| tree | ad4d9c19f7a98bb4f35b35104ffecb5723f686c8 /fs/lockd | |
| parent | b4350861dd6d5668bb9fe18eec4227d30e9131b0 (diff) | |
| parent | afb2d552bc4c241c009f5947311a95de426a75d9 (diff) | |
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:
ahci: improve spurious SDB FIS handling
ahci/pata_jmicron: match class not function number
jmicron ATA: reimplement jmicron ATA quirk
pata_jmicron: drop unnecessary device programming in [re]init
libata: blacklist FUJITSU MHT2060BH for NCQ
sata_sil24: kill unused local variable idx in sil24_fill_sg()
libata: clear drvdata in ata_host_release(), take#2
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions