diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-07 21:00:14 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-07 21:00:14 +0100 |
| commit | 820b688bed62f21020873c055f521b9e1f45a954 (patch) | |
| tree | 290bbc34fed8698b883e3a9a08da71df20a85efa /drivers/net/wireless/brcm80211/brcmsmac/channel.c | |
| parent | Merge git://www.linux-watchdog.org/linux-watchdog (diff) | |
| parent | ahci: disable MSI on SAMSUNG 0xa800 SSD (diff) | |
| download | linux-820b688bed62f21020873c055f521b9e1f45a954.tar.xz linux-820b688bed62f21020873c055f521b9e1f45a954.zip | |
Merge branch 'for-3.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixes from Tejun Heo:
"Three libata fixes for v3.18. Nothing too interesting. PCI ID ID and
quirk additions to ahci and an error handling path fix in sata_fsl"
* 'for-3.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
ahci: disable MSI on SAMSUNG 0xa800 SSD
sata_fsl: fix error handling of irq_of_parse_and_map
AHCI: Add DeviceIDs for Sunrise Point-LP SATA controller
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac/channel.c')
0 files changed, 0 insertions, 0 deletions