summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'restart' into for-linusRussell King2012-01-0532-2/+87
|\
| * ARM: 7198/1: arm/imx6: add restart support for imx6qShawn Guo2012-01-053-3/+57
| * ARM: restart: mxc: use new restart hookRussell King2012-01-0530-0/+31
* | Merge branch 'devel-stable' into for-linusRussell King2012-01-051-1/+1
|\ \
| * \ Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/pe...Russell King2011-12-191-1/+1
| |\ \
| | * | imx6q: Remove unconditional dependency on l2x0 L2 cache supportDave Martin2011-12-191-1/+0
| | * | ARM: SMP: Refactor Kconfig to be more maintainableDave Martin2011-12-191-0/+1
* | | | cpuimx35: fix touchscreen supportEric Bénard2011-12-191-1/+7
* | | | cpuimx35sd: fix KconfigEric Bénard2011-12-192-3/+3
* | | | clock-imx35: fix reboot in internal boot modeEric Bénard2011-12-191-10/+10
* | | | cpuimx25sd: fix KconfigEric Bénard2011-12-192-3/+3
| |_|/ |/| |
* | | Merge branch 'imx/fix-irqdomain' of git://git.linaro.org/people/shawnguo/linu...Arnd Bergmann2011-12-061-4/+5
|\ \ \ | |/ / |/| |
| * | arm/imx: fix irq_base for gpioShawn Guo2011-12-011-3/+2
| * | arm/imx: fix return type of callback passed to of_irq_init()Shawn Guo2011-12-011-1/+3
| |/
* | Merge branch 'imx-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 int...Arnd Bergmann2011-11-232-64/+58
|\ \
| * \ Merge branch 'cleanups/remove-unused-kconfig' into imx-fixes-for-arndSascha Hauer2011-11-221-13/+0
| |\ \
| | * | ARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35'Paul Bolle2011-11-221-13/+0
| | |/
| * | Merge branch 'cleanups/assorted' into imx-fixes-for-arndSascha Hauer2011-11-221-25/+28
| |\ \
| | * | arm/imx: remove imx_idle hook and use pm_idle insteadShawn Guo2011-11-111-25/+28
| * | | ARM: imx/mm-imx3: conditionally compile i.MX31 and i.MX35 codeUwe Kleine-König2011-11-221-27/+31
| | |/ | |/|
* | | Merge branch 'for-arnd' of git://git.kernel.org/pub/scm/linux/kernel/git/will...Arnd Bergmann2011-11-231-0/+7
|\ \ \
| * | | ARM: mach-imx: convert logical CPU numbers to physical numbersWill Deacon2011-11-161-0/+7
| |/ /
* / / ARM: imx6q: move clock register map to machine_desc.map_ioRichard Zhao2011-11-172-2/+6
|/ /
* | arm/imx: fix imx6q mmc error when mounting rootfsShawn Guo2011-11-111-1/+16
* | arm/imx: fix the references to ARCH_MX3Shawn Guo2011-11-111-15/+19
|/
* Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-063-0/+3
|\
| * arm: fix implicit use of moduleparam in mach-mx31*.cPaul Gortmaker2011-10-313-0/+3
* | Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6Linus Torvalds2011-11-035-11/+15
|\ \
| * | ARM: imx/mx31moboard: use mc13xxx structs instead of removed mc13783 structsUwe Kleine-König2011-10-241-3/+3
| * | ARM: imx/mx31moboard: Add mc13783 power button supportPhilippe Rétornaz2011-10-241-0/+8
| * | ARM: imx+mc13xxx: remove obsolete leds and regulators flagsPhilippe Rétornaz2011-10-245-9/+5
| * | ARM: imx: use mc13xxx constants instead of mc13783Uwe Kleine-König2011-10-243-5/+5
* | | Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-0114-1/+2739
|\ \ \
| * \ \ Merge branch 'imx/imx6q' into next/socArnd Bergmann2011-11-0214-1/+2739
| |\ \ \
| | * | | arm/imx: merge i.MX3 and i.MX6Sascha Hauer2011-10-311-4/+3
| | * | | arm/imx6q: add suspend/resume supportShawn Guo2011-10-313-1/+99
| | * | | arm/imx6q: add device tree machine supportShawn Guo2011-10-312-1/+85
| | * | | arm/imx6q: add smp and cpu hotplug supportShawn Guo2011-10-316-0/+241
| | * | | arm/imx6q: add core drivers clock, gpc, mmdc and srcShawn Guo2011-10-316-0/+2263
| | * | | arm/imx6q: add core definitions and low-level debug uartShawn Guo2011-10-314-0/+53
| | * | | Merge branch 'imx/devel' into imx/imx6qArnd Bergmann2011-10-3147-384/+481
| | |\ \ \
| * | \ \ \ Merge branch 'highbank/soc' into next/socArnd Bergmann2011-11-022-4/+2
| |\ \ \ \ \
| | * | | | | Merge branch 'dt/gic' into highbank/socArnd Bergmann2011-10-3126-27/+27
| | |\| | | |
| | | \ \ \ \
| | | \ \ \ \
| | *-. \ \ \ \ Merge branches 'depends/rmk/io', 'depends/rmk/l2x0' and 'depends/rmk/gpio' in...Arnd Bergmann2011-10-302-4/+2
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'imx/devel' into next/dtArnd Bergmann2011-11-0147-384/+481
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linu...Arnd Bergmann2011-10-203-3/+3
| | |\| | | |
* | | | | | | Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-0139-90/+185
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'depends/rmk/gpio' into next/develArnd Bergmann2011-10-312-4/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | | | | | |
| | \ \ \ \ \ \
| *-. \ \ \ \ \ \ Merge branches 'sirf/devel', 'at91/devel', 'imx/devel' and 'davinci/devel' in...Arnd Bergmann2011-10-0747-384/+481
| |\ \ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | / / / | | |_|_|_|/ / / | |/| | | | | |
| | | * | | | | Merge branch 'imx/cleanup' into imx/develArnd Bergmann2011-10-0711-289/+279
| | | |\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 10:49:09 +0000