diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-08 13:29:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-08 13:29:18 -0800 |
| commit | 633bb7388bf399b2d4b16951404d69f34f9ddbec (patch) | |
| tree | e6d70e7eee1b1c4013ea4176e0fbfd558269f08e /drivers/net/usb/ax88172a.c | |
| parent | 51825c8a869e5df6bdfb7b2baf4a3cc7f337d34e (diff) | |
| parent | 4f2568f5cb475529aa2894adc7c7912517c83cb0 (diff) | |
Merge branch 'for-4.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixes from Tejun Heo:
"Nothing too interesting. All are device specific additions and
workarounds"
* 'for-4.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
ata/sata_fsl.c: add ATA_FLAG_NO_LOG_PAGE to blacklist the controller for log page reads
libata-eh.c: Introduce new ata port flag for controller which lockup on read log page
sata_sil: disable trim
AHCI: Fix softreset failed issue of Port Multiplier
sata/mvebu: use #ifdef around suspend/resume code
ahci: Order SATA device IDs for codename Lewisburg
ahci: Add Device ID for Intel Sunrise Point PCH
Diffstat (limited to 'drivers/net/usb/ax88172a.c')
0 files changed, 0 insertions, 0 deletions