summaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-29 21:30:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-29 21:30:28 -0700
commit4bde23f8751f388867766b0a62ed1ef8b7e01561 (patch)
tree9ad3d165483fda3349c2bf0195406eebaa7af5ce /arch/sparc
parente152c38abaa92352679c9b53c4cce533c03997c6 (diff)
parentf00e9b11863abdb837e555a2b1e3417e8b5d80dd (diff)
downloadblackbird-op-linux-4bde23f8751f388867766b0a62ed1ef8b7e01561.tar.gz
blackbird-op-linux-4bde23f8751f388867766b0a62ed1ef8b7e01561.zip
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
Diffstat (limited to 'arch/sparc')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud