diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-12-18 00:33:09 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-18 00:33:58 +0300 |
commit | d0b6342df0201c9a53629e59b67513fa72d82c58 (patch) | |
tree | ec40fd4aad71bf635064c593c05eb1e109c85887 /arch/arm/mach-pxa/mp900.c | |
parent | 70722803de91a7670979dcb5748631b4e3c1b219 (diff) | |
parent | c4aa1937b7f40adc93e2e0a901314a4bd8991174 (diff) | |
download | linux-d0b6342df0201c9a53629e59b67513fa72d82c58.tar.xz |
Merge branch 'fixes' into next/multiplatform
The 'fixes' branch contains d5d4fdd86f57 ("irqchip/versatile-fpga:
Fix PCI IRQ mapping on Versatile PB") that is required for booting
the versatile platform prior to the rework in this branch, but
including both causes a build-time error.
I'm doing an evil merge here to pull in the fixes branch so we have
that commit included but at the same time revert the trivial change.
This gives us a bisectable history.
* fixes: (22 commits)
fsl-ifc: add missing include on ARM64
ls2080a/dts: Add little endian property for GPIO IP block
dt-bindings: define little-endian property for QorIQ GPIO
ARM64: dts: ls2080a: fix eSDHC endianness
ARM: dts: vf610: use reset values for L2 cache latencies
ARM: pxa: use PWM lookup table for all machines
ARM: dts: berlin: add 2nd clock for BG2Q sdhci0 and sdhci1
ARM: dts: berlin: correct BG2Q's sdhci2 2nd clock
ARM: dts: am4372: fix clock source for arm twd and global timers
ARM: at91: fix pinctrl driver selection
ARM: at91/dt: add always-on to 1.8V regulator
ARM: dts: vf610: fix clock definition for SAI2
ARM: imx: clk-vf610: fix SAI clock tree
ARM: ixp4xx: fix read{b,w,l} return types
irqchip/versatile-fpga: Fix PCI IRQ mapping on Versatile PB
ARM: OMAP2+: enable REGULATOR_FIXED_VOLTAGE
ARM: dts: add dm816x missing spi DT dma handles
ARM: dts: add dm816x missing #mbox-cells
cpufreq: s3c24xx: Do not mark s3c2410_plls_add as __init
bus: sunxi-rsb: unlock on error in sunxi_rsb_read()
...
Diffstat (limited to 'arch/arm/mach-pxa/mp900.c')
0 files changed, 0 insertions, 0 deletions