summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-11-17 23:15:25 -0800
committerOlof Johansson <olof@lixom.net>2016-11-17 23:15:25 -0800
commit9e27a0aac08fd92e07dedb376772537d5687d9c6 (patch)
tree85446100569a73622d6d15e801bc4fd9b33672a9 /arch/arm/mach-integrator
parent56d027b41791238a21c1e00159f26641ca3dc121 (diff)
parente413bd33ac44b6d0bebc0ef2ac19cbe7558a7303 (diff)
downloadblackbird-op-linux-9e27a0aac08fd92e07dedb376772537d5687d9c6.tar.gz
blackbird-op-linux-9e27a0aac08fd92e07dedb376772537d5687d9c6.zip
Merge tag 'pxa-for-4.10' of https://github.com/rjarzmik/linux into next/soc
This is the pxa changes for v4.10 cycle. This cycle is covering : - some clock fixes common with sa1100 architecture - the consequence of the pxa_camera conversion to v4l2 - a small irq related fix for pxa25x device-tree only * tag 'pxa-for-4.10' of https://github.com/rjarzmik/linux: ARM: pxa: fix pxa25x interrupt init ARM: pxa: remove duplicated include from spitz.c ARM: pxa: em-x270: use the new pxa_camera platform_data ARM: pxa: ezx: use the new pxa_camera platform_data ARM: pxa: mioa701: use the new pxa_camera platform_data ARM: pxa: pxa_cplds: honor probe deferral ARM: sa11x0/pxa: get rid of get_clock_tick_rate watchdog: sa11x0/pxa: get rid of get_clock_tick_rate ARM: sa11x0/pxa: acquire timer rate from the clock rate clk: pxa25x: OSTIMER0 clocks from the main oscillator Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-integrator')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud