commit 327f81c4558dac2138a6339069988d3baa5a152d
author Olof Johansson <olof@lixom.net> Wed Oct 17 17:09:37 2012 -0700
committer Olof Johansson <olof@lixom.net> Wed Oct 17 17:09:37 2012 -0700
tree a7f0a5e461c3299aacf7b04d4a8358e6e20ec189
parent b5beb20d03c89a1ea7cb208c445546f2c62225e4
parent a458926e16a37ef41a4fbf45957cb9faaeb6a6ef

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