mirror of
https://github.com/torvalds/linux.git
synced 2024-12-22 10:56:40 +00:00
4bde23f875
This is a first pass of some of the merge window fallout for ARM platforms.
Nothing controversial:
* A system.h fallout fix for OMAP
* PXA fixes for breakage caused by the regulator struct changes
* GPIO fixes for OMAP to properly deal with dynamic IRQ allocation
* A mismerge in our arm-soc tree of an lpc32xx change for networking
* A fix for USB setup on tegra
* An undo of __init annotation of display mux setup on OMAP that's needed
at runtime
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJPdSzXAAoJEIwa5zzehBx3b6sQAIhmAQbkYmlkU5GefUmPR++B
JIu8XFKEgWYaviRPj5cUZ4Lx3DWIIcwcGD2AmFdA2RY6JJmULY2Hw2v9yn8mhDPS
7319kMK/Niu3c/DIwxyXHihOQ0LSF+V4dKyHcX1zhG8MFXtUVNudNMg9DwbWMqhk
IXNNREuTTc5313i6cocSIKizGMqED6xxhnuAAt4cTzT/vfSDicNq7DdH6kmPqTgV
azuAlgvDI+k7RvPQY360hLVXFBEGDZV/uOWJFfgtmZcxwhfRVJuEp6+lGFDHNLXU
jbYt/NeLOOv4C+KEDKolR2YJ/xe/gM//rLD2vErT+DTPUuEyQblo8JXEGsRCdNhF
UWK2PW/gBgVW/tFAaDSCLRYPxWL5IUoE2NA7XOF4Gi8hPn1o8JaRXeAhDRK47xiv
NnS4nYJF6dFsxYCH+SJkiotY8/y+CkDPWhE4lChPWxJTDeMuREGrDkUNCRs06by8
I7AVXqBv00q+e3QjE8zE+1AxQEXBty+DwhyzefGKwI8PntfqhuVSVXb2x7DO2hXk
hBAJt/6nBy0IHa0pRPZ4QkA+phXRES5zAyZ9R3oDEW37t1EqhKEnOsmLU4s9CxAk
Lqelzx31SzTpN1VkqjCkRDxXNC5Ww02WmAO+mWoeCUlvnM4GwpmWriXn9lej87KQ
fbIgpnFen1ftSJn6fLnN
=36Eb
-----END PGP SIGNATURE-----
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc fixes from Olof Johansson:
"This is a first pass of some of the merge window fallout for ARM
platforms.
Nothing controversial:
- A system.h fallout fix for OMAP
- PXA fixes for breakage caused by the regulator struct changes
- GPIO fixes for OMAP to properly deal with dynamic IRQ allocation
- A mismerge in our arm-soc tree of an lpc32xx change for networking
- A fix for USB setup on tegra
- An undo of __init annotation of display mux setup on OMAP that's
needed at runtime"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: pxa: fix build issue on stargate2
ARM: pxa: fix build issue on cm-x300
ARM: pxa: fix build failure for regulator consumer in em-x270.c
ARM: LPC32xx: clock.c: Fix lpc-eth clock reference
ARM: OMAP: pm: fix compilation break
ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition
drivers: input: Fix OMAP_GPIO_IRQ with gpio_to_irq() in ams_delta_serio_exit()
ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()
ARM: pxa: fix regulator related build fail in magician_defconfig
ARM: tegra: Fix device tree AUXDATA for USB/EHCI
ARM: OMAP2+: Remove __init from DSI mux functions
|
||
|---|---|---|
| .. | ||
| include/mach | ||
| apbio.c | ||
| apbio.h | ||
| board-dt-tegra20.c | ||
| board-dt-tegra30.c | ||
| board-harmony-pcie.c | ||
| board-harmony-pinmux.c | ||
| board-harmony-power.c | ||
| board-harmony.c | ||
| board-harmony.h | ||
| board-paz00-pinmux.c | ||
| board-paz00.c | ||
| board-paz00.h | ||
| board-pinmux.c | ||
| board-pinmux.h | ||
| board-seaboard-pinmux.c | ||
| board-seaboard.c | ||
| board-seaboard.h | ||
| board-trimslice-pinmux.c | ||
| board-trimslice.c | ||
| board-trimslice.h | ||
| board.h | ||
| clock.c | ||
| clock.h | ||
| common.c | ||
| cpu-tegra.c | ||
| cpuidle.c | ||
| devices.c | ||
| devices.h | ||
| dma.c | ||
| flowctrl.c | ||
| flowctrl.h | ||
| fuse.c | ||
| fuse.h | ||
| gpio-names.h | ||
| headsmp.S | ||
| hotplug.c | ||
| io.c | ||
| irq.c | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||
| pcie.c | ||
| pinmux-tegra20-tables.c | ||
| pinmux-tegra30-tables.c | ||
| pinmux.c | ||
| platsmp.c | ||
| pmc.c | ||
| pmc.h | ||
| powergate.c | ||
| reset.c | ||
| reset.h | ||
| sleep.S | ||
| tegra2_clocks.c | ||
| tegra2_emc.c | ||
| tegra2_emc.h | ||
| tegra30_clocks.c | ||
| timer.c | ||
| usb_phy.c | ||