summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kirkwood/dt' into next/dt2Arnd Bergmann2012-03-244-4/+360
|\
| * Merge tag 'imx35-cam-fb' of git://git.pengutronix.de/git/imx/linux-2.6 into n...Arnd Bergmann2012-03-151-0/+216
| |\
| | * i.MX35-PDK: Add Camera supportAlex Gershgorin2012-03-141-1/+97
| | * ARM : mx35: 3ds-board: add framebuffer devicewu guoxing2012-03-141-0/+120
| * | Merge branch 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/lin...Arnd Bergmann2012-03-022-1/+4
| |\ \
| | * | mx31moboard: Add watchdog supportPhilippe Rétornaz2012-03-022-0/+3
| | * | mx31moboard: update maintainerPhilippe Rétornaz2012-03-021-1/+1
| | |/
| * | Merge branch 'features/imx27-visstrim' of git://git.pengutronix.de/git/imx/li...Arnd Bergmann2012-03-022-3/+140
| |\ \
| | * | i.MX27: visstrim_m10: Add led support.Javier Martin2012-03-022-0/+32
| | * | i.MX27: visstrim_m10: Add video support.Javier Martin2012-03-022-0/+101
| | * | i.MX27: visstrim_m10: Register I2C devices after I2C busses have been added.Javier Martin2012-03-021-2/+3
| | * | i.MX27: visstrim_m10: Sort IMX_HAVE_PLATFORM_MXC_MMC properly.Javier Martin2012-03-021-1/+1
| | * | i.MX27: visstrim_m10: Add m41t00 RTC support.Javier Martin2012-03-021-0/+3
| | |/
* | | Merge branch 'ux500/dt' into next/dt2Arnd Bergmann2012-03-163-36/+2
|\ \ \
| * | | ARM: imx6q: convert to twd_local_timer_register() interfaceMarc Zyngier2012-03-133-36/+2
| | |/ | |/|
* | | Merge branch 'features/imx27-dt' of git://git.pengutronix.de/git/imx/linux-2....Arnd Bergmann2012-03-024-0/+116
|\ \ \
| * | | ARM i.MX27: Add devicetree supportSascha Hauer2012-02-294-0/+116
| |/ /
| | |
| \ \
*-. \ \ Merge branches 'depends/irqdomain' and 'at91/base2+cleanup' into next/dtArnd Bergmann2012-03-023-5/+6
|\ \ \ \ | | | |/ | | |/|
| * | | irq_domain: Remove irq_domain_add_simple()Grant Likely2012-02-163-5/+6
| | |/ | |/|
* | | Merge branch 'imx/dt' of git://git.linaro.org/people/shawnguo/linux-2.6 into ...Arnd Bergmann2012-02-284-0/+6
|\ \ \ | |_|/ |/| |
| * | ARM i.MX5/6: Add dt support for generic boardsSascha Hauer2012-02-273-0/+3
| * | ARM: imx5: generate dtbs for imx5 boardsShawn Guo2012-02-271-0/+3
| |/
* | Merge tag 'v3.3-rc2' into depends/rmk/for-armsocOlof Johansson2012-02-0833-4/+7684
|\|
| * 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
* | | ARM: plat-mxc: hook special idle handlers to arm_pm_idleNicolas Pitre2012-01-212-29/+26
|/ /
* | Merge branch 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux in...Olof Johansson2012-01-171-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