Merge branch 'for-4.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 May 2016 15:13:42 +0000 (08:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 May 2016 15:13:42 +0000 (08:13 -0700)
commit35cd3f4563c4a0fc99be300afc7b82a822e634c7
treee27c2fa0588110d0280c0b327ea4548475096394
parentb4184cbff393d9ede2d80efd7088126706c1ce08
parent535dac4ab5f42e040e8405b31e309a6b6d4eee57
Merge branch 'for-4.6-fixes' of git://git./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