diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-24 08:41:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-24 08:41:36 -0700 |
| commit | 726ce0656b99ac6436b590d83613fe8447b4769e (patch) | |
| tree | e5a79d920891e2f7ae8329207543ad9873092161 /fs/cifs/smbencrypt.c | |
| parent | d96328055c8501f0ac4a6c343215fa8a2a140306 (diff) | |
| parent | f920fe1cb74191a780d88937f36994231a8faba1 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_marvell: Add support for 88SE91A0, 88SE91A4
libata/sas: only set FROZEN flag if new EH is supported
libata: apply NOSETXFER horkage to the affected Pioneer drives regardless of firmware revision
drivers/ata/sata_dwc_460ex: Fix typo 'corrresponding'
Diffstat (limited to 'fs/cifs/smbencrypt.c')
0 files changed, 0 insertions, 0 deletions