summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-0917-58/+97
|\
| * Merge branch 'imx/clk' into next/clkArnd Bergmann2012-01-0317-58/+97
| |\
| | * Merge branch 'mxs/clk-prepare' of git://git.linaro.org/people/shawnguo/linux-...Arnd Bergmann2012-01-0317-58/+97
| |/|
| | * ARM: mxs: select HAVE_CLK_PREPARE for clockShawn Guo2011-12-282-9/+23
| | * clk: add config option HAVE_CLK_PREPARE into KconfigShawn Guo2011-12-281-0/+3
| | * ASoC: mxs-saif: convert to clk_prepare/clk_unprepareShawn Guo2011-12-281-2/+2
| | * video: mxsfb: convert to clk_prepare/clk_unprepareShawn Guo2011-12-281-4/+4
| | * serial: mxs-auart: convert to clk_prepare/clk_unprepareShawn Guo2011-12-281-4/+4
| | * net: flexcan: convert to clk_prepare/clk_unprepareShawn Guo2011-12-281-5/+5
| | * mtd: gpmi-lib: convert to clk_prepare/clk_unprepareShawn Guo2011-12-281-6/+6
| | * mmc: mxs-mmc: convert to clk_prepare/clk_unprepareShawn Guo2011-12-281-5/+5
| | * dma: mxs-dma: convert to clk_prepare/clk_unprepareShawn Guo2011-12-281-4/+4
| | * net: fec: add clk_prepare/clk_unprepareRichard Zhao2011-12-281-5/+5
| | * ARM: mxs: convert platform code to clk_prepare/clk_unprepareShawn Guo2011-12-286-14/+14
| | * clk: add helper functions clk_prepare_enable and clk_disable_unprepareRichard Zhao2011-12-281-0/+22
* | | Merge tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-091-223/+124
|\ \ \
| * | | msm: timer: Use clockevents_config_and_register()Stephen Boyd2011-11-101-10/+1
| * | | msm: timer: Setup interrupt after registering clockeventStephen Boyd2011-11-101-4/+2
| * | | msm: timer: Remove SoC specific #ifdefsStephen Boyd2011-11-101-21/+17
| * | | msm: timer: Remove msm_clocks[] and simplify codeStephen Boyd2011-11-101-145/+76
| * | | msm: timer: Fix ONESHOT mode interruptsStephen Boyd2011-11-101-5/+20
| * | | msm: timer: Use GPT for clockevents and DGT for clocksourceStephen Boyd2011-11-101-69/+52
| * | | msm: timer: Cleanup #includes and #definesStephen Boyd2011-11-101-19/+7
| * | | msm: timer: Tighten #ifdef for local timer supportStephen Boyd2011-11-101-3/+2
* | | | Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-0959-1180/+3871
|\ \ \ \
| * \ \ \ Merge branch 'imx6/pm' into next/pmOlof Johansson2012-01-061-1/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'imx/pm2' of git://git.linaro.org/people/shawnguo/linux-2.6 into...Olof Johansson2012-01-061-1/+1
| | |\ \ \ \
| | | * | | | ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1Shawn Guo2011-12-311-1/+0
| | | * | | | ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidationShawn Guo2011-12-301-0/+1
| | | | |/ / | | | |/| |
| * | | | | Merge branch 'imx6/pm' into next/pmArnd Bergmann2012-01-039-22/+74
| |\| | | |
| | * | | | Merge branch 'imx/pm' of git://git.linaro.org/people/shawnguo/linux-2.6 into ...Arnd Bergmann2012-01-039-22/+74
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | ARM: imx6q: resume PL310 only when CACHE_L2X0 definedEric Miao2011-12-262-4/+11
| | | * | | ARM: imx6q: build pm code only when CONFIG_PM selectedEric Miao2011-12-264-2/+15
| | | * | | ARM: mx5: use generic irq chip pm interface for pm functions onHui Wang2011-12-254-16/+48
| | |/ / /
| * | | | Merge branch 'v3.2-rc7' into next/pmArnd Bergmann2012-01-03674-5040/+8465
| |\| | |
| * | | | Merge branch 'omap/uart' into next/pmOlof Johansson2011-12-2038-1124/+1066
| |\ \ \ \
| | * \ \ \ Merge branch 'uart' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/l...Olof Johansson2011-12-2038-1124/+1066
| | |\ \ \ \
| | | * | | | ARM: omap: pass minimal SoC/board data for UART from dtRajendra Nayak2011-12-163-1/+59
| | | * | | | arm/dts: Add minimal device tree support for omap2420 and omap2430Tony Lindgren2011-12-161-0/+67
| | | * | | | omap-serial: Add minimal device tree supportRajendra Nayak2011-12-162-3/+52
| | | * | | | omap-serial: Use default clock speed (48Mhz) if not specifiedRajendra Nayak2011-12-161-0/+7
| | | * | | | omap-serial: Get rid of all pdev->id usageRajendra Nayak2011-12-161-15/+15
| | | * | | | Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/...Tony Lindgren2011-12-1633-1107/+868
| | | |\ \ \ \
| | | | * | | | ARM: OMAP2+: UART: Fix compilation/sparse warningsGovindraj.R2011-12-151-3/+4
| | | | * | | | ARM: OMAP2+: UART: Remove omap_uart_can_sleep and add pm_qosGovindraj.R2011-12-156-42/+41
| | | | * | | | ARM: OMAP2+: UART: Do not gate uart clocks if used for debug_printsGovindraj.R2011-12-151-1/+10
| | | | * | | | ARM: OMAP2+: UART: Avoid uart idling on suspend for no_console_suspend usecaseGovindraj.R2011-12-151-1/+8
| | | | * | | | ARM: OMAP2+: UART: Avoid console uart idling during bootupGovindraj.R2011-12-151-26/+25
| | | | * | | | ARM: OMAP2+: UART: remove temporary variable used to count uart instanceGovindraj.R2011-12-151-5/+2
| | | | * | | | ARM: OMAP2+: UART: Make the RX_TIMEOUT for DMA configurable for each UARTJon Hunter2011-12-153-9/+14