aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/Kconfig
Commit message (Expand)AuthorAge
* Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/...Linus Torvalds2012-05-23
|\
| * ARM: mx31_3ds: Add sound supportPhilippe Rétornaz2012-05-18
| * mx31moboard: Add sound supportPhilippe Rétornaz2012-05-18
* | Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-22
|\ \
| * | ARM: imx: eukrea_mbimxsd: add audio supportEric Bénard2012-05-08
| * | ARM: imx: eukrea_cpuimx51sd: add watchdog supportEric Bénard2012-05-08
| * | ARM: imx: eukrea-cpuimx51: remove boardEric Bénard2012-05-08
| * | ARM: imx: eukrea_mbimxsd35: add spi controler and spidev supportEric Bénard2012-05-08
| * | ARM: imx: eukrea_cpuimx25: add watchdog supportEric Bénard2012-05-08
| * | ARM: imx: eukrea_mbimxsd25: add spi controler and spidev supportEric Bénard2012-05-08
| |/
* | Merge tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-22
|\ \
| * | ARM: imx6q: switch to use pinctrl subsystemDong Aisheng2012-05-08
| |/
* / arm: imx: add missing select IMX_HAVE_PLATFORM for MACH_MX35_3DS in KconfigMarc Kleine-Budde2012-04-26
|/
* Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2012-03-29
|\
| * dmaengine: imx-dma: merge old dma-v1.c with imx-dma.cJavier Martin2012-03-26
* | Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-27
|\ \
| * | ARM i.MX27: Add devicetree supportSascha Hauer2012-02-29
* | | Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-27
|\ \ \
| * | | ARM: mx27_3ds: Add camera supportFabio Estevam2012-02-27
| |/ /
* | | Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...Arnd Bergmann2012-03-27
|\ \ \
| * | | ASoC: imx: move audmux driver into sound/soc/imxShawn Guo2012-03-05
| * | | ARM: imx: merge audmux-v1 and audmux-v2Shawn Guo2012-03-05
| |/ /
* | | Merge branch 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/lin...Arnd Bergmann2012-03-02
|\ \ \
| * | | mx31moboard: Add watchdog supportPhilippe Rétornaz2012-03-02
| |/ /
* | | i.MX27: visstrim_m10: Add led support.Javier Martin2012-03-02
* | | i.MX27: visstrim_m10: Add video support.Javier Martin2012-03-02
* | | i.MX27: visstrim_m10: Sort IMX_HAVE_PLATFORM_MXC_MMC properly.Javier Martin2012-03-02
|/ /
* | Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-01-28
|\|
* | Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-01-23
|\ \ | |/ |/|
| * ARM i.MX: Merge i.MX5 support into mach-imxSascha Hauer2011-11-16
* | Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-09
|\ \
| * | ARM: imx6q: build pm code only when CONFIG_PM selectedEric Miao2011-12-25
* | | Merge branch 'samsung/cleanup' into next/boardsArnd Bergmann2012-01-09
|\ \ \
| * \ \ Merge branch 'devel-stable' into for-linusRussell King2012-01-05
| |\ \ \
| | * \ \ Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/pe...Russell King2011-12-19
| | |\ \ \ | | | |/ / | | |/| |
| | | * | imx6q: Remove unconditional dependency on l2x0 L2 cache supportDave Martin2011-12-19
| | | * | ARM: SMP: Refactor Kconfig to be more maintainableDave Martin2011-12-19
| | | |/
| * | | cpuimx35sd: fix KconfigEric Bénard2011-12-19
| * | | cpuimx25sd: fix KconfigEric Bénard2011-12-19
| |/ /
* / / MX1:apf9328: Add i2c supportGwenhael Goavec-Merou2012-01-03
|/ /
* / ARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35'Paul Bolle2011-11-22
|/
* Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-02
|\
| * arm/imx: merge i.MX3 and i.MX6Sascha Hauer2011-10-31
| * arm/imx6q: add smp and cpu hotplug supportShawn Guo2011-10-31
| * arm/imx6q: add core drivers clock, gpc, mmdc and srcShawn Guo2011-10-31
| * arm/imx6q: add core definitions and low-level debug uartShawn Guo2011-10-31
* | Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-01
|\|
| *-. Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-mul...Sascha Hauer2011-09-29
| |\ \
| | * | ARM: mach-qong: Add watchdog supportFabio Estevam2011-09-20
| | | |
| | \ \
| *-. \ \ Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata...Sascha Hauer2011-08-26
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|