summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/include
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'v3.3-rc2' into depends/rmk/for-armsocOlof Johansson2012-02-071-1/+1
|\
| * ARM: imx: iomux-v1.h: Fix build error due to __init annotationFabio Estevam2012-01-261-1/+1
* | 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-092-2/+8
|\ \
| * \ Merge branch 'imx6/pm' into next/pmArnd Bergmann2012-01-032-2/+8
| |\ \
| | * | 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-251-1/+1
* | | | Merge branch 'samsung/cleanup' into next/boardsArnd Bergmann2012-01-093-3/+3
|\ \ \ \
| * \ \ \ Merge branch 'restart' into for-linusRussell King2012-01-052-3/+2
| |\ \ \ \
| | * | | | 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-052-2/+4
| | | |/ / | | |/| |
| * | | | Merge branch 'devel-stable' into for-linusRussell King2012-01-054-36/+0
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | enable uncompress log on cpuimx35sdEric Bénard2011-12-191-0/+1
| | |/ / | |/| |
* | | | Merge branch 'imx/board' into next/boardsArnd Bergmann2012-01-031-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | iomux-mx25: configuration to support CSPI3 on CSI pinsPaul Fertser2012-01-031-0/+4
| |/ /
* | | 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-053-21/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'imx-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 int...Arnd Bergmann2011-11-233-21/+1
| |\ \ \
| | * \ \ Merge branch 'cleanups/assorted' into imx-fixes-for-arndSascha Hauer2011-11-223-21/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | arm/imx: remove imx_idle hook and use pm_idle insteadShawn Guo2011-11-112-7/+1
| | | * | ARM: imx: Remove unused chip revision stringsFabio Estevam2011-11-111-14/+0
| | | |/
| * | | ARM: imx6q: move clock register map to machine_desc.map_ioRichard Zhao2011-11-171-0/+1
| |/ /
* | | ARM: imx: convert smp platforms to global gic_handle_irq()Marc Zyngier2011-11-152-13/+1
* | | ARM: mxc: rename gic_handle_irq to avoid name clashMarc Zyngier2011-11-151-2/+2
|/ /
* | ARM: mxc: Remove test_for_ltirqDirk Behme2011-11-041-3/+0
|/
* Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-016-2/+84
|\
| * Merge branch 'imx/imx6q' into next/socArnd Bergmann2011-11-026-34/+90
| |\
| | * 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-312-0/+8
| | * arm/imx6q: add core definitions and low-level debug uartShawn Guo2011-10-314-2/+49
| | * Merge branch 'cross-platform/debug_ll' into imx/imx6qArnd Bergmann2011-10-311-32/+6
| | |\
| | * \ Merge branch 'imx/devel' into imx/imx6qArnd Bergmann2011-10-3117-4094/+2106
| | |\ \
| * | \ \ 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-0117-4094/+2105
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | 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-015-73/+24
|\ \ \ \ \ \
OpenPOWER on IntegriCloud