summaryrefslogtreecommitdiffstats
path: root/arch/arm
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cleanup-hwmod' into cleanupTony Lindgren2012-06-2822-187/+409
|\
| *-----. Merge branches 'clock_cleanup_misc_3.6', 'control_clean_dspbridge_writes_clea...Paul Walmsley2012-06-2021-185/+409
| |\ \ \ \
| | | | | * ARM: OMAP2+: hwmod: remove prm_clkdm, cm_clkdm; allow hwmods to have no clock...Paul Walmsley2012-06-199-47/+19
| | | | * | ARM: OMAP3: Move McBSP fck clock alias to hwmod dataPeter Ujfalusi2012-06-182-10/+21
| | | | * | ARM: OMAP2: Move McBSP fck clock alias to hwmod data for OMAP2430Peter Ujfalusi2012-06-182-10/+15
| | | | * | ARM: OMAP2: Move McBSP fck clock alias to hwmod data for OMAP2420Peter Ujfalusi2012-06-182-4/+9
| | | | |/
| | | * | ARM: OMAP2+: hwmod: use init-time function pointer for _init_clkdmKevin Hilman2012-06-181-4/+4
| | | * | ARM: OMAP2+: hwmod: use init-time function pointer for hardresetKevin Hilman2012-06-181-47/+169
| | | * | ARM: OMAP2+: hwmod: use init-time function pointer for wait_target_readyKevin Hilman2012-06-181-49/+66
| | | * | ARM: OMAP4: hwmod: drop extra cpu_is check from _wait_target_disable()Kevin Hilman2012-06-181-3/+0
| | | * | ARM: OMAP2+: hwmod: use init-time function ptrs for enable/disable moduleKevin Hilman2012-06-186-12/+57
| | | * | ARM: OMAP4: hwmod: rename _enable_module to _omap4_enable_module()Kevin Hilman2012-06-181-5/+5
| | | |/
| | * | ARM: OMAP: dsp: interface to control module functionsOmar Ramirez Luna2012-06-182-0/+7
| | * | ARM: OMAP2+: control: new APIs to configure boot address and modeOmar Ramirez Luna2012-06-183-0/+46
| | |/
| * / ARM: OMAP2+: CLEANUP: Remove ARCH_OMAPx ifdef from struct dpll_dataKevin Hilman2012-06-181-2/+0
| |/
| |
| \
*-. \ Merge branches 'cleanup-udc' and 'cleanup-dma' into cleanupTony Lindgren2012-06-2827-831/+329
|\ \ \
| | * | ARM: OMAP: dma: Clear status registers on enable/disable irqOleg Matcovschi2012-06-031-31/+28
| * | | ARM: OMAP: Make FS USB omap1 onlyTony Lindgren2012-06-0420-393/+301
| * | | ARM: OMAP2: Remove legacy USB FS supportTony Lindgren2012-06-046-406/+0
| * | | ARM: OMAP3: There is no FS USB controller on omap3Tony Lindgren2012-06-041-1/+0
| |/ /
* | | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-06-2423-42/+77
|\ \ \
| * | | ARM: Orion: Fix Virtual/Physical mixup with watchdogAndrew Lunn2012-06-235-2/+5
| * | | ARM: Kirkwood: clk_register_gate_fn: add fn assignmentMarc Kleine-Budde2012-06-231-0/+1
| * | | ARM: Orion5x - Restore parts of io.h, with reworkAndrew Lunn2012-06-232-0/+23
| * | | Merge tag 'omap-fixes-a-for-3.5rc' of git://git.kernel.org/pub/scm/linux/kern...Olof Johansson2012-06-237-5/+28
| |\ \ \
| | * | | ARM: OMAP4: hwmod data: Force HDMI in no-idle while enabledRicardo Neri2012-06-211-0/+5
| | * | | ARM: OMAP2+: mux: fix sparse warningPaul Walmsley2012-06-211-0/+1
| | * | | ARM: OMAP2+: CM: increase the module disable timeoutPaul Walmsley2012-06-212-2/+13
| | * | | ARM: OMAP4: clock data: add clockdomains for clocks used as main clocksPaul Walmsley2012-06-211-0/+5
| | * | | ARM: OMAP4: hwmod data: fix 32k sync timer idle modesPaul Walmsley2012-06-211-2/+1
| | * | | ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-StandbyDjamil Elaidi2012-06-211-1/+1
| | * | | ARM: OMAP: PM: Lock clocks list while generating summaryTodd Poynor2012-06-171-0/+2
| | | |/ | | |/|
| * | | Merge tag 'omap-fixes-for-v3.5-rc3' of git://git.kernel.org/pub/scm/linux/ker...Olof Johansson2012-06-236-31/+19
| |\ \ \
| | * | | ARM: OMAP: Fix Beagleboard DVI reset gpioRuss Dill2012-06-201-16/+12
| | * | | arm/dts: OMAP2: Fix interrupt controller bindingJon Hunter2012-06-201-0/+2
| | * | | ARM: OMAP2: Fix tusb6010 GPIO interrupt for n8x0Tony Lindgren2012-06-201-1/+1
| | * | | ARM: OMAP2+: Fix MUSB ifdefs for platform init codeTony Lindgren2012-06-203-14/+4
| | |/ /
| * | | ARM: tegra: make tegra_cpu_reset_handler_enable() __initStephen Warren2012-06-181-1/+1
| * | | ARM: iconnect: Remove include of removed linux/spi/orion_spi.hAndrew Lunn2012-06-171-3/+0
* | | | Merge tag 'tty-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2012-06-201-53/+1
|\ \ \ \
| * | | | serial/amba-pl011: move custom pin control to driverLinus Walleij2012-06-121-53/+1
* | | | | Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-06-2046-46/+46
|\ \ \ \ \
| * | | | | Viresh has movedViresh Kumar2012-06-2046-46/+46
| | |_|/ / | |/| | |
* | | | | Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-06-205-1/+12
|\ \ \ \ \
| * | | | | ARM: 7425/1: extable: ensure fixup entries are 4-byte alignedWill Deacon2012-06-162-0/+2
| * | | | | ARM: 7421/1: bpf_jit: BPF_S_ANC_ALU_XOR_X supportMircea Gherzan2012-06-142-0/+9
| * | | | | ARM: 7423/1: kprobes: run t32_simulate_ldr_literal() without insn slotRabin Vincent2012-06-141-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/...Linus Torvalds2012-06-191-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | ARM: MMP: add pxa910-ssp into ssp_id_tableQiao Zhou2012-06-111-0/+1
| |/ / /
* | | | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-06-1746-176/+396
|\ \ \ \ | |_|/ / |/| | |