summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | ARM:i.MX: fix build error in tzic/avic.cJason Liu2011-11-042-0/+2
| * | ARM: mxc: fix local timer interrupt handlingMarc Zyngier2011-11-041-9/+2
| |/
* | ARM: restart: only perform setup for restart when soft-restartingRussell King2011-11-211-1/+1
|/
* Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-019-7/+140
|\
| * Merge branch 'imx/imx6q' into next/socArnd Bergmann2011-11-029-39/+146
| |\
| | * arm/imx: merge i.MX3 and i.MX6Sascha Hauer2011-10-311-11/+7
| | * arm/imx6q: add suspend/resume supportShawn Guo2011-10-311-0/+9
| | * arm/imx6q: add device tree machine supportShawn Guo2011-10-311-0/+13
| | * arm/imx6q: add smp and cpu hotplug supportShawn Guo2011-10-311-0/+5
| | * arm/imx: add gic_handle_irq functionShawn Guo2011-10-314-1/+57
| | * arm/imx6q: add core definitions and low-level debug uartShawn Guo2011-10-315-2/+56
| | * Merge branch 'cross-platform/debug_ll' into imx/imx6qArnd Bergmann2011-10-311-32/+6
| | |\
| | * \ Merge branch 'imx/devel' into imx/imx6qArnd Bergmann2011-10-3134-4190/+2488
| | |\ \
| * | \ \ Merge branch 'highbank/soc' into next/socArnd Bergmann2011-11-021-32/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'dt/gic' into highbank/socArnd Bergmann2011-10-312-59/+1
| | |\ \ \ \ | | | |/ / /
| | | | | |
| | | \ \ \
| | *-. \ \ \ Merge branches 'depends/rmk/io', 'depends/rmk/l2x0' and 'depends/rmk/gpio' in...Arnd Bergmann2011-10-301-6/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-0/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'imx/devel' into next/dtArnd Bergmann2011-11-0134-4190/+2487
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'dt/gic' into next/dtArnd Bergmann2011-10-312-59/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | arm/mx5: add device tree support for imx51 babbageShawn Guo2011-10-181-0/+2
| * | | | | | | arm/mx5: add device tree support for imx53 boardsShawn Guo2011-10-181-0/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-32/+6
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | arm/imx: use Kconfig choice for low-level debug UART selectionShawn Guo2011-10-171-32/+6
| |/ / / / /
* | | | | | Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-0112-140/+154
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'depends/rmk/gpio' into next/develArnd Bergmann2011-10-311-32/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linu...Arnd Bergmann2011-10-204-0/+171
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'imx/cleanup' into imx/develArnd Bergmann2011-10-0718-4049/+2091
| |\ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| *---. \ \ \ \ \ \ Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-mul...Sascha Hauer2011-09-299-95/+128
| |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | ARM i.MX entry-macro.S: remove now unused codeSascha Hauer2011-09-261-57/+1
| | | | * | | | | | | ARM i.MX tzic: add handle_irq functionSascha Hauer2011-09-262-1/+27
OpenPOWER on IntegriCloud