From: Olof Johansson <olof@lixom.net>
Date: Thu, 18 Oct 2012 00:09:37 +0000 (-0700)
Subject: Merge tag 'mvebu_dove_late_fixes_for_v3.7' of git://git.infradead.org/users/jcooper... 
X-Git-Tag: firefly_0821_release~3680^2~1703^2~17
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=327f81c4558dac2138a6339069988d3baa5a152d;p=firefly-linux-kernel-4.4.55.git

Merge tag 'mvebu_dove_late_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux into fixes

From Jason Cooper:

Misc. fixes for latest changes to mach-dove/
Fixes build breakage for mach-dove

* tag 'mvebu_dove_late_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux:
  ARM: dove: Add crypto engine to DT
  ARM: dove: Remove watchdog from DT
  ARM: dove: Restructure SoC device tree descriptor
  ARM: dove: Fix clock names of sata and gbe
  ARM: dove: Fix tauros2 device tree init
  ARM: dove: Add pcie clock support
---

327f81c4558dac2138a6339069988d3baa5a152d