summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...Arnd Bergmann2012-03-275-351/+0
|\
| * ASoC: imx: move audmux driver into sound/soc/imxShawn Guo2012-03-064-363/+0
| * ARM: imx: convert audmux to a platform driverRichard Zhao2012-03-061-35/+92
| * ARM: imx: merge audmux-v1 and audmux-v2Shawn Guo2012-03-064-73/+28
* | Merge tag 'v3.3-rc2' into depends/rmk/for-armsocOlof Johansson2012-02-072-13/+4
|\ \ | |/
| * Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-01-281-1/+1
| |\
| | * ARM: imx: iomux-v1.h: Fix build error due to __init annotationFabio Estevam2012-01-261-1/+1
| * | Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-01-231-12/+3
| |\ \ | | |/ | |/|
| | * ARM i.MX: Merge i.MX5 support into mach-imxSascha Hauer2011-11-161-12/+3
* | | ARM: big removal of now unused arch_idle()Nicolas Pitre2012-01-201-25/+0
|/ /
* | Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2012-01-171-0/+15
|\ \
| * | video i.MX IPU: Fix display connectionsSascha Hauer2011-12-081-0/+15
| |/
* | Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-093-13/+37
|\ \
| * \ Merge branch 'imx6/pm' into next/pmArnd Bergmann2012-01-033-13/+37
| |\ \
| | * | ARM: imx6q: build pm code only when CONFIG_PM selectedEric Miao2011-12-261-1/+7
| | * | ARM: mx5: use generic irq chip pm interface for pm functions onHui Wang2011-12-252-12/+30
| * | | Merge branch 'v3.2-rc7' into next/pmArnd Bergmann2012-01-032-1/+7
| |\ \ \ | | |/ /
* | | | Merge branch 'samsung/cleanup' into next/boardsArnd Bergmann2012-01-098-24/+18
|\ \ \ \
| * \ \ \ Merge branch 'restart' into for-linusRussell King2012-01-053-11/+3
| |\ \ \ \
| | * | | | ARM: 7198/1: arm/imx6: add restart support for imx6qShawn Guo2012-01-051-0/+1
| | * | | | ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| | * | | | ARM: restart: mxc: use new restart hookRussell King2012-01-053-10/+5
| | * | | | Merge branch 'restart-cleanup' into restartRussell King2012-01-0511-37/+17
| | |\ \ \ \ | | | | |/ / | | | |/| |
| * | | | | Merge branch 'devel-stable' into for-linusRussell King2012-01-059-91/+5
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/pe...Russell King2011-12-191-0/+1
| | |\ \ \ \ \
| | | * | | | | ARM: l2x0/pl310: Refactor Kconfig to be more maintainableDave Martin2011-12-191-0/+1
| | * | | | | | ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtimeMarc Zyngier2011-12-181-12/+3
| | | |_|_|/ / | | |/| | | |
| * | | | | | enable uncompress log on cpuimx35sdEric Bénard2011-12-191-0/+1
| * | | | | | arm/imx: fix cpufreq section mismatchRichard Zhao2011-12-191-1/+1
| * | | | | | ARM:imx:fix pwm period valueJason Chen2011-12-191-0/+9
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'imx/board' into next/boardsArnd Bergmann2012-01-033-1/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | iomux-mx25: configuration to support CSPI3 on CSI pinsPaul Fertser2012-01-031-0/+4
| |/ / / /
| * | | | ARM: imx: fix cpufreq build errorsRichard Zhao2011-12-091-0/+1
| * | | | MXC PWM: should active during DOZE/WAIT/DBG modeJason Chen2011-12-091-1/+6
* | | | | Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-s...Russell King2011-12-052-24/+0
|\ \ \ \ \
| * | | | | ARM: big removal of now unused vmalloc.h filesNicolas Pitre2011-11-261-22/+0
| * | | | | ARM: plat-mxc: remove inclusion of <mach/vmalloc.h>Nicolas Pitre2011-11-151-2/+0
| | |/ / / | |/| | |
* | | | | Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/...Russell King2011-12-054-22/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'imx-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 int...Arnd Bergmann2011-11-234-22/+3
| |\ \ \ \
| | * \ \ \ Merge branch 'cleanups/assorted' into imx-fixes-for-arndSascha Hauer2011-11-224-22/+1
| | |\ \ \ \
| | | * | | | arm/imx: remove imx_idle hook and use pm_idle insteadShawn Guo2011-11-113-8/+1
| | | * | | | ARM: imx: Remove unused chip revision stringsFabio Estevam2011-11-111-14/+0
| | | | |_|/ | | | |/| |
| | * | | | ARM: imx: export imx_ioremapArnd Bergmann2011-11-221-0/+2
| | | |/ / | | |/| |
| * | | | ARM: imx6q: move clock register map to machine_desc.map_ioRichard Zhao2011-11-171-0/+1
| |/ / /
* | | | Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/ke...Russell King2011-11-217-66/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | ARM: imx: convert smp platforms to global gic_handle_irq()Marc Zyngier2011-11-154-55/+1
| * | | ARM: mxc: rename gic_handle_irq to avoid name clashMarc Zyngier2011-11-152-3/+3
| |/ /
| * | Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2...Olof Johansson2011-11-111-2/+2
| |\ \
| | * | arm/imx: fix AUTO_ZRELADDR selectionShawn Guo2011-11-111-2/+2
| | |/
| * | ARM: mxc: Remove test_for_ltirqDirk Behme2011-11-041-3/+0
OpenPOWER on IntegriCloud