Merge tag 'xgene-dts-for-v4.7-part1' of https://github.com/AppliedMicro/xgene-next...
authorArnd Bergmann <arnd@arndb.de>
Mon, 25 Apr 2016 20:53:01 +0000 (22:53 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 25 Apr 2016 20:53:01 +0000 (22:53 +0200)
commit11a138e479425e02787f0512be3d0386c17dca73
tree283c8b127a7cdb789479cab28139e2a830bed3a0
parent04136309a2398ce132ba38cd0f2c88c6aea2cca1
parent01d1b6e543cfdc0f05027686b35d73de73caec10
Merge tag 'xgene-dts-for-v4.7-part1' of https://github.com/AppliedMicro/xgene-next into next/dt64

Merge "First part of X-Gene DTS changes queued for v4.7" from Duc Dang:

This patch set only includes a single change to
fix the compatible string for SATA controllers on
X-Gene v2 SOC platforms.

* tag 'xgene-dts-for-v4.7-part1' of https://github.com/AppliedMicro/xgene-next:
  arm64: dts: apm: Fix compatible string for X-Gene 2 SATA controller DTS node