diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-08 22:53:27 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-08 22:53:27 -0800 |
| commit | ba0e1fa928e6e7a47d54008b1a701b02a858d0e4 (patch) | |
| tree | 1678c0ca4697b7e698a0a162481eca28272758a1 /arch/arm/mach-zynq | |
| parent | cfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff) | |
| parent | 29525484cd2524a31ee0924831ab43b46ea6ebe1 (diff) | |
| download | op-kernel-dev-ba0e1fa928e6e7a47d54008b1a701b02a858d0e4.zip op-kernel-dev-ba0e1fa928e6e7a47d54008b1a701b02a858d0e4.tar.gz | |
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
Diffstat (limited to 'arch/arm/mach-zynq')
0 files changed, 0 insertions, 0 deletions
