diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 18:11:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 18:11:38 -0800 |
| commit | 488a9d018256dc9f29e041c0360445b6d25eea9a (patch) | |
| tree | 4a3eb0927409d3e8ca199cc690056c188b232eb2 /drivers/pcmcia/rsrc_mgr.c | |
| parent | 6015ff103133c7e50a753c198c69bcabc3a5e3b0 (diff) | |
| parent | b73fa4630e63e4d23407181c2bc0a54777bd0ce8 (diff) | |
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
* 'upstream-linus' of git://github.com/jgarzik/libata-dev:
[libata] ata_piix: Add Toshiba Satellite Pro A120 to the quirks list due to broken suspend functionality.
[libata] add DVRTD08A and DVR-215 to NOSETXFER device quirk list
[libata] pata_bf54x: Support sg list in bmdma transfer.
[libata] sata_fsl: fix the controller operating mode
[libata] enable ata port async suspend
Diffstat (limited to 'drivers/pcmcia/rsrc_mgr.c')
0 files changed, 0 insertions, 0 deletions