From: Arnd Bergmann Date: Mon, 25 Apr 2016 20:53:01 +0000 (+0200) Subject: Merge tag 'xgene-dts-for-v4.7-part1' of https://github.com/AppliedMicro/xgene-next... X-Git-Tag: v4.7-rc1~135^2~12 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=11a138e479425e02787f0512be3d0386c17dca73;p=karo-tx-linux.git 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 --- 11a138e479425e02787f0512be3d0386c17dca73