Merge tag 'gemini-v4.13-dts-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linus...
authorOlof Johansson <olof@lixom.net>
Mon, 19 Jun 2017 03:31:59 +0000 (20:31 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 19 Jun 2017 03:31:59 +0000 (20:31 -0700)
commit392366c34c364e4cc20cb6a9967caf76b71e2fd0
tree78953b949db205be5da7237b95f3f2524d2925c4
parent2a65ec81b750d24e1310546852c5166d622609b2
parent0d7a2c35d11e974b98a6396cd24b39b0f3f5bb7b
Merge tag 'gemini-v4.13-dts-2' of git://git./linux/kernel/git/linusw/linux-nomadik into next/dt

Gemini DTS patches for v4.13, take 2:
- Add DMA controller
- Add PATA controller and SATA bridge

* tag 'gemini-v4.13-dts-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: add Gemini PATA/SATA support
  ARM: dts: Add Gemini DMA controller

Signed-off-by: Olof Johansson <olof@lixom.net>