summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-01-282-5/+1
|\
| * ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMPWill Deacon2012-01-231-4/+1
* | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-01-282-1/+14
|\ \
| * | ARM: imx6: add missing twd_clk for imx6q clockShawn Guo2012-01-201-0/+11
| |/
* | Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-01-2331-0/+7677
|\ \ | |/ |/|
| * ARM i.MX: Merge i.MX5 support into mach-imxSascha Hauer2011-11-1631-0/+7641
* | Merge branch 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux in...Olof Johansson2012-01-161-2/+1
|\ \
| * | ARM: imx: remove incorrect BSYM usageRob Herring2012-01-161-2/+1
* | | ARM: Add arm_memblock_steal() to allocate memory away from the kernelRussell King2012-01-133-9/+6
* | | Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-094-6/+20
|\ \ \
| * \ \ Merge branch 'imx/pm2' of git://git.linaro.org/people/shawnguo/linux-2.6 into...Olof Johansson2012-01-061-1/+1
| |\ \ \
| | * | | ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1Shawn Guo2011-12-311-1/+0
| | * | | ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidationShawn Guo2011-12-301-0/+1
| * | | | ARM: imx6q: resume PL310 only when CACHE_L2X0 definedEric Miao2011-12-262-4/+11
| * | | | ARM: imx6q: build pm code only when CONFIG_PM selectedEric Miao2011-12-263-1/+8
| |/ / /
* | | | Merge branch 'samsung/cleanup' into next/boardsArnd Bergmann2012-01-0935-20/+111
|\ \ \ \
| * \ \ \ 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/board' into next/boardsArnd Bergmann2012-01-033-1/+12
|\ \ \ \ \
| * | | | | ARM: mx31pdk: Add MC13783 RTC supportFabio Estevam2012-01-031-1/+1
| * | | | | MX1:apf9328: Add i2c supportGwenhael Goavec-Merou2012-01-032-0/+11
| |/ / / /
* | | | | ARM: imx6q: generate imx6q dtb filesEric Miao2011-12-141-0/+3
* | | | | arm/imx6q: Rename Sabreauto to Armadillo2Dirk Behme2011-12-141-1/+1
* | | | | arm/imx6q-sabrelite: add enet phy ksz9021rn fixupRichard Zhao2011-12-141-0/+21
* | | | | arm/imx6: add imx6q sabrelite board supportRichard Zhao2011-12-141-0/+1
|/ / / /
* | | | 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