Merge branch 'integrator/multiplatform-base' into next/cleanup2
authorOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 06:53:27 +0000 (22:53 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 06:53:27 +0000 (22:53 -0800)
commitba0e1fa928e6e7a47d54008b1a701b02a858d0e4
tree1678c0ca4697b7e698a0a162481eca28272758a1
parentcfbf8d4857c26a8a307fb7cd258074c9dcd8c691
parent29525484cd2524a31ee0924831ab43b46ea6ebe1
Merge branch 'integrator/multiplatform-base' into next/cleanup2

* integrator/multiplatform-base:
  ARM: integrator: select GPIO block
  ARM: integrator: register the IM-PD1 VIC
  ARM: integrator: use managed resources for the IM-PD1
  irqchip: support cascaded VICs
  irqchip: vic: update the base IRQ member correctly
  clk: versatile: respect parent rate in ICST clock
  clk: versatile: pass a parent to the ICST clock
  ARM: integrator: switch to fetch clocks from device tree
  ARM: SP804: make Integrator/CP timer pick clock from DT
  ARM: integrator: define clocks in the device trees