diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-07 17:13:42 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-07 17:13:42 +0200 |
commit | 35cd3f4563c4a0fc99be300afc7b82a822e634c7 (patch) | |
tree | e27c2fa0588110d0280c0b327ea4548475096394 /arch/nios2/boot | |
parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledfo... (diff) | |
parent | ata: add AMD Seattle platform driver (diff) | |
download | linux-35cd3f4563c4a0fc99be300afc7b82a822e634c7.tar.xz linux-35cd3f4563c4a0fc99be300afc7b82a822e634c7.zip |
Merge branch 'for-4.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixes from Tejun Heo:
"An ahci driver addition and updates to ahci port enable handling for
some platform devices"
* 'for-4.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
ata: add AMD Seattle platform driver
ARM: dts: apq8064: add ahci ports-implemented mask
ata: ahci-platform: Add ports-implemented DT bindings.
libahci: save port map for forced port map
Diffstat (limited to 'arch/nios2/boot')
0 files changed, 0 insertions, 0 deletions