summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx5
Commit message (Expand)AuthorAgeFilesLines
* ARM: restart: mxc: use new restart hookRussell King2012-01-0513-1/+14
* Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2...Arnd Bergmann2011-12-134-4/+4
|\
| * arm/imx: fix power button on imx51 babbage boardShawn Guo2011-12-091-1/+1
| * ARM: mx5: add __initconst for fec pdataDong Aisheng2011-12-093-3/+3
* | Merge branch 'imx/fix-irqdomain' of git://git.linaro.org/people/shawnguo/linu...Arnd Bergmann2011-12-062-10/+14
|\ \ | |/ |/|
| * arm/imx: fix irq_base for gpioShawn Guo2011-12-012-6/+4
| * arm/imx: fix return type of callback passed to of_irq_init()Shawn Guo2011-12-012-4/+10
* | Merge branch 'cleanups/assorted' into imx-fixes-for-arndSascha Hauer2011-11-222-4/+7
|\ \ | |/ |/|
| * ARM: mx5: Fix checkpatch warnings in cpu-imx5.cFabio Estevam2011-11-221-2/+3
| * arm/imx: remove imx_idle hook and use pm_idle insteadShawn Guo2011-11-111-2/+4
* | Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2...Olof Johansson2011-11-111-2/+2
|\ \
| * | ARM: mx51/53: set pwm clock parent to ipg_perclkRichard Zhao2011-11-111-2/+2
| |/
* | ARM:i.MX: fix build error in clock-mx51-mx53.cJason Liu2011-11-041-0/+2
|/
* Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6Linus Torvalds2011-11-031-1/+1
|\
| * ARM: imx+mc13xxx: remove obsolete leds and regulators flagsPhilippe Rétornaz2011-10-241-1/+1
* | Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-0110-12/+341
|\ \
| * \ Merge branch 'imx/devel' into next/dtArnd Bergmann2011-11-0127-384/+269
| |\ \
| * \ \ Merge branch 'dt/gic' into next/dtArnd Bergmann2011-10-316-6/+6
| |\ \ \
| * | | | arm/mx5: add device tree support for imx51 babbageShawn Guo2011-10-185-2/+141
| * | | | arm/mx5: add device tree support for imx53 boardsShawn Guo2011-10-188-10/+200
| | |_|/ | |/| |
* | | | Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-0116-79/+81
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linu...Arnd Bergmann2011-10-205-0/+39
| |\ \ \
| * \ \ \ Merge branch 'imx/cleanup' into imx/develArnd Bergmann2011-10-0721-317/+136
| |\ \ \ \
| * | | | | ARM: mx5: fix clock usage for suspendArnaud Patard (Rtp)2011-10-071-3/+12
| | | | | |
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| *---. \ \ \ \ Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-mul...Sascha Hauer2011-09-2912-4/+37
| |\ \ \ \ \ \ \
| | | | * | | | | ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLERSascha Hauer2011-09-2611-0/+11
| | | | | |_|/ / | | | | |/| | |
| | * | | | | | efika: Configure esdhc cd/wp on efika mx/sbArnaud Patard (Rtp)2011-08-273-4/+26
| | | | | | | |
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| *-----. \ \ \ \ \ \ Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata...Sascha Hauer2011-08-266-75/+40
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | / / / / / | | | | |_|/ / / / / | | | |/| | | | | |
| | | | * | | | | | ARM i.MX: allow to compile together all i.MX5 based SoCsSascha Hauer2011-08-241-14/+4
| | | | | |/ / / / | | | | |/| | | |
| | * | | | | | | ARM: mx5: use generic function for displaying silicon revisionJason Liu2011-08-262-61/+19
| | | |/ / / / / | | |/| | | | |
| * | | | | | | ARM: mx53_loco: Add support for the accelerometerFabio Estevam2011-08-251-0/+20
| |/ / / / / /
* | | | | | | Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-018-0/+55
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branches 'imx/pata' and 'imx/sata' into next/driverArnd Bergmann2011-10-2010-14/+57
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | MX53 Enable the AHCI SATA on MX53 SMD boardRichard Zhu2011-10-071-0/+16
| | * | | | | MX53 Enable the AHCI SATA on MX53 LOCO boardRichard Zhu2011-10-071-0/+1
| | * | | | | MX53 Enable the AHCI SATA on MX53 ARD boardRichard Zhu2011-10-071-0/+1
| | * | | | | AHCI Add the AHCI SATA feature on the MX53 platformsRichard Zhu2011-10-072-0/+21
| | |/ / / /
| * | | | | ARM: imx: Define functions for registering PATAFabio Estevam2011-08-241-0/+4
| * | | | | ARM: imx: Add PATA clock supportFabio Estevam2011-08-241-0/+1
| * | | | | imx: efika: Enable pata.Arnaud Patard (Rtp)2011-08-232-0/+3
| * | | | | imx51: add pata clockArnaud Patard (Rtp)2011-08-231-0/+5
| * | | | | imx51: add pata deviceArnaud Patard (Rtp)2011-08-231-0/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-0121-305/+133
|\ \ \ \ \
| * \ \ \ \ Merge branch 'next/fixes' into next/cleanupArnd Bergmann2011-10-311-3/+12
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'depends/rmk/memory_h' into next/fixesArnd Bergmann2011-10-316-6/+6
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| * | | | | | Merge branch 'depends/rmk/devel-stable' into next/cleanupArnd Bergmann2011-10-086-6/+6
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanupSascha Hauer2011-10-043-1/+9
| |\ \ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | arm/imx: remove cpu_is_xxx() from arch_idle()Shawn Guo2011-10-043-1/+9
| | |/ / / /
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanupSascha Hauer2011-09-203-102/+47
| |\ \ \ \ \ \
| | | * | | | | ARM: mx5/mm: consolidate TZIC map codeJason Liu2011-09-201-23/+4
OpenPOWER on IntegriCloud