summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-273-36/+2
|\
| * Merge branch 'tegra/cleanups' into next/timerArnd Bergmann2012-03-213-46/+37
| |\
| * | ARM: imx6q: convert to twd_local_timer_register() interfaceMarc Zyngier2012-03-133-36/+2
* | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-274-94/+91
|\ \ \
| * \ \ Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into...Arnd Bergmann2012-02-274-94/+91
| |\ \ \ | | |_|/ | |/| |
| | * | ARM: mx3: Let mx31 and mx35 share the same CCM header fileFabio Estevam2012-02-274-94/+91
| | |/
* | | Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2012-03-272-2/+2
|\ \ \
| * | | ARM: mach-imx: mx3: Fix section mismatch in imx3_init_l2x0()Fabio Estevam2012-02-271-1/+1
| * | | ARM: mach-pcm038: Fix field name of regulator_consumer_supply structFabio Estevam2012-02-271-1/+1
| | |/ | |/|
* | | Merge tag 'bug-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paul...Linus Torvalds2012-03-241-0/+1
|\ \ \
| * | | bug.h: add include of it to various implicit C usersPaul Gortmaker2012-02-291-0/+1
| |/ /
* | | Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-233-46/+37
|\ \ \ | | |/ | |/|
| * | Merge tag 'v3.3-rc2' into depends/rmk/for-armsocOlof Johansson2012-02-0733-4/+7684
| |\ \ | | |/
| * | ARM: plat-mxc: hook special idle handlers to arm_pm_idleNicolas Pitre2012-01-202-29/+26
* | | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-03-232-1/+3
|\ \ \
| * \ \ Merge tag 'v3.3' into staging/for_v3.4Mauro Carvalho Chehab2012-03-1933-4/+7690
| |\ \ \ | | | |/ | | |/|
| * | | [media] MX2: Add platform definitions for eMMa-PrP deviceJavier Martin2012-02-282-1/+3
| | |/ | |/|
* | | Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/...Linus Torvalds2012-03-2213-87/+56
|\ \ \
| * | | ASoC: mx27vis-aic32x4: Convert it to platform driverFabio Estevam2012-03-131-0/+1
| * | | ASoC: imx: move audmux driver into sound/soc/imxShawn Guo2012-03-062-7/+0
| * | | ARM: imx: convert audmux to a platform driverRichard Zhao2012-03-065-0/+55
| * | | ARM: imx: merge audmux-v1 and audmux-v2Shawn Guo2012-03-061-6/+6
| * | | ASoC: imx: move phycore audmux call into ASoC machine driverShawn Guo2012-03-062-26/+0
| * | | ASoC: imx: move eukrea audmux call into ASoC machine driverShawn Guo2012-03-063-54/+0
| | |/ | |/|
* | | Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/br...Linus Torvalds2012-03-211-0/+9
|\ \ \
| * | | ARM i.MX pcm037: register a dummy regulator for the smsc911x deviceSascha Hauer2012-03-031-0/+9
| |/ /
* | | Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2012-03-213-5/+6
|\ \ \
| * | | irq_domain: Remove irq_domain_add_simple()Grant Likely2012-02-163-5/+6
| |/ /
* | | arm: imx: Start using struct usb_otgHeikki Krogerus2012-02-132-16/+28
* | | usb: otg: Rename otg_transceiver to usb_phyHeikki Krogerus2012-02-132-6/+6
|/ /
* | 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
| |\ \ \ \ | | |_|/ / | |/| | |
OpenPOWER on IntegriCloud