summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2012-03-291-6/+0
|\
| * dmaengine: imx-dma: merge old dma-v1.c with imx-dma.cJavier Martin2012-03-261-6/+0
* | Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-271-0/+8
|\ \
| * | ARM i.MX27: Add devicetree supportSascha Hauer2012-02-291-0/+8
* | | Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-271-0/+1
|\ \ \
| * | | ARM: mx27_3ds: Add camera supportFabio Estevam2012-02-271-0/+1
| |/ /
* | | Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...Arnd Bergmann2012-03-271-6/+0
|\ \ \
| * | | ASoC: imx: move audmux driver into sound/soc/imxShawn Guo2012-03-061-6/+0
| * | | ARM: imx: merge audmux-v1 and audmux-v2Shawn Guo2012-03-061-6/+6
| |/ /
* | | Merge branch 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/lin...Arnd Bergmann2012-03-021-0/+1
|\ \ \
| * | | mx31moboard: Add watchdog supportPhilippe Rétornaz2012-03-021-0/+1
| |/ /
* | | i.MX27: visstrim_m10: Add led support.Javier Martin2012-03-021-0/+1
* | | i.MX27: visstrim_m10: Add video support.Javier Martin2012-03-021-0/+1
* | | i.MX27: visstrim_m10: Sort IMX_HAVE_PLATFORM_MXC_MMC properly.Javier Martin2012-03-021-1/+1
|/ /
* | Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-01-281-1/+0
|\ \ | |/
* | Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-01-231-0/+239
|\ \ | |/ |/|
| * ARM i.MX: Merge i.MX5 support into mach-imxSascha Hauer2011-11-161-0/+239
* | Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-091-0/+1
|\ \
| * | ARM: imx6q: build pm code only when CONFIG_PM selectedEric Miao2011-12-261-0/+1
* | | Merge branch 'samsung/cleanup' into next/boardsArnd Bergmann2012-01-091-5/+5
|\ \ \
| * \ \ 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
| | | |/
| * | | cpuimx35sd: fix KconfigEric Bénard2011-12-191-2/+2
| * | | cpuimx25sd: fix KconfigEric Bénard2011-12-191-2/+2
| |/ /
* | | MX1:apf9328: Add i2c supportGwenhael Goavec-Merou2012-01-031-0/+1
|/ /
* | ARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35'Paul Bolle2011-11-221-13/+0
|/
* Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-1/+29
|\
| * arm/imx: merge i.MX3 and i.MX6Sascha Hauer2011-10-311-4/+3
| * arm/imx6q: add smp and cpu hotplug supportShawn Guo2011-10-311-0/+1
| * arm/imx6q: add core drivers clock, gpc, mmdc and srcShawn Guo2011-10-311-0/+13
| * arm/imx6q: add core definitions and low-level debug uartShawn Guo2011-10-311-0/+15
* | Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-33/+19
|\ \ | |/
| *-. Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-mul...Sascha Hauer2011-09-291-0/+1
| |\ \
| | * | ARM: mach-qong: Add watchdog supportFabio Estevam2011-09-201-0/+1
| | | |
| | \ \
| *-. \ \ Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata...Sascha Hauer2011-08-261-33/+17
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | | * ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCsSascha Hauer2011-08-241-33/+17
| | |/
| * | ARM: mach-imx/mx25_3ds: Add FlexCAN supportFabio Estevam2011-08-261-0/+1
| |/
* | ARM: mx31pdk: Fix build by passing IMX_HAVE_PLATFORM_MXC_MMCFabio Estevam2011-09-191-0/+1
|/
* ARM: mach-imx/mx27_3ds: Add LCD supportFabio Estevam2011-07-071-0/+1
* ARM: imx: convert to new leds-gpio registration helperUwe Kleine-König2011-07-071-0/+5
* ARM: imx: move mx3 support to mach-imxUwe Kleine-König2011-05-191-0/+276
* MX1: Add ARMadeus Systems APF9328 board supportGwenhael Goavec-Merou2011-05-191-0/+7
* ARM: mxc: don't use the symbols in the CPU family choice to select othersUwe Kleine-König2011-05-191-0/+1
* ARM: imx: use imx_add_gpio_keys to register "gpio-keys" devicesUwe Kleine-König2011-05-191-0/+2
* ARM: imx: let MACH_IMX27_VISSTRIM_M10 select IMX_HAVE_PLATFORM_IMX_SSIUwe Kleine-König2011-03-231-0/+1
* ARM: mx25_3ds: Add I2C supportFabio Estevam2011-03-071-0/+1
* ARM: mx27_3ds: Add I2C supportFabio Estevam2011-03-071-0/+1
* ARM: Add SSI and aic3204 code to Visstrim_M10 boards.Javier Martin2011-03-071-0/+1
OpenPOWER on IntegriCloud