From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 May 2016 15:13:42 +0000 (-0700)
Subject: Merge branch 'for-4.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: v5.15~13715
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=35cd3f4563c4a0fc99be300afc7b82a822e634c7;p=mirror_ubuntu-kernels.git

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
---

35cd3f4563c4a0fc99be300afc7b82a822e634c7