diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-29 09:48:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-29 09:48:25 -0800 |
| commit | de92a0589c8d450d5c1ac275599cbb64f415d813 (patch) | |
| tree | 56853ffe56a17a5bf82757bb65e43f6ffb1910b7 /ipc/Makefile | |
| parent | 2855987d13d2de99eb337cae98f5656e93452617 (diff) | |
| parent | c5700766975c69d27150256444db63fbfd103791 (diff) | |
Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixes from Tejun Heo:
"libata device removal path was removing parent device node before its
child, which is mostly harmless but triggers warning after recent
sysfs changes. Rafael's patch fixes the order.
Other than that, minor controller-specific fixes and device ID
additions"
* 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
ATA: Fix port removal ordering
ahci: add Marvell 9230 to the AHCI PCI device list
ata: fix acpi_bus_get_device() return value check
pata_arasan_cf: add missing clk_disable_unprepare() on error path
ahci: add support for IBM Akebono platform device
Diffstat (limited to 'ipc/Makefile')
0 files changed, 0 insertions, 0 deletions