summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'irq' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-07-231-4/+0
|\
| * Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2...Arnd Bergmann2012-07-061-4/+0
| |\
| | * ARM: imx: select USE_OFUwe Kleine-König2012-07-061-4/+0
* | | Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-07-231-0/+13
|\ \ \
| * \ \ Merge branch 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2...Arnd Bergmann2012-07-121-0/+1
| |\ \ \
| | * | | ARM: imx6q: ensure ANATOP controller is availableOtavio Salvador2012-07-121-0/+1
| * | | | Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dtArnd Bergmann2012-07-121-0/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | ARM i.MX31: Add devicetree supportDenis 'GNUtoo' Carikli2012-07-101-0/+8
| | |/ /
| * | | ARM: imx: enable flexcan on imx25, imx35, imx53, imx6qMarc Kleine-Budde2012-07-031-0/+4
| |/ /
* | | Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-07-231-1/+2
|\ \ \
| * | | ARM: imx: add rtc support to mx35_3dsBenoît Thébaudeau2012-07-091-0/+1
| * | | ARM: imx: fix i.MX35 CPU architectureBenoît Thébaudeau2012-07-091-1/+1
| |/ /
* | | Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into ne...Arnd Bergmann2012-07-061-1/+0
|\ \ \ | |/ / |/| |
| * | ARM: imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX_SSI from MACH_MX25_3DSFabio Estevam2012-07-051-1/+0
| |/
* | Merge branch 'imx/fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into f...Olof Johansson2012-06-071-0/+1
|\ \ | |/ |/|
| * ARM: mx31_3ds: Fix build due to missing IMX_HAVE_PLATFORM_IMX_SSIFabio Estevam2012-05-291-0/+1
* | Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-261-0/+8
|\ \
| * \ Merge branch 'imx/pinctrl' into imx/clockArnd Bergmann2012-05-141-0/+2
| |\ \
| * | | ARM: i.MX6: implement clocks using common clock frameworkShawn Guo2012-05-091-0/+1
| * | | ARM i.MX35: implement clocks using common clock frameworkSascha Hauer2012-05-091-0/+1
| * | | ARM i.MX5: implement clocks using common clock frameworkSascha Hauer2012-05-091-0/+1
| * | | ARM i.MX31: implement clocks using common clock frameworkSascha Hauer2012-05-021-0/+1
| * | | ARM i.MX27: implement clocks using common clock frameworkSascha Hauer2012-05-021-0/+1
| * | | ARM i.MX21: implement clocks using common clock frameworkSascha Hauer2012-05-021-0/+1
| * | | ARM i.MX1: implement clocks using common clock frameworkSascha Hauer2012-05-021-0/+1
| * | | ARM i.MX25: implement clocks using common clock frameworkSascha Hauer2012-05-021-0/+1
| | |/ | |/|
* | | Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/...Linus Torvalds2012-05-231-0/+2
|\ \ \
| * | | ARM: mx31_3ds: Add sound supportPhilippe Rétornaz2012-05-181-0/+1
| * | | mx31moboard: Add sound supportPhilippe Rétornaz2012-05-181-0/+1
| |/ /
* | | Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-221-30/+5
|\ \ \
| * | | ARM: imx: eukrea_mbimxsd: add audio supportEric Bénard2012-05-081-0/+1
| * | | ARM: imx: eukrea_cpuimx51sd: add watchdog supportEric Bénard2012-05-081-0/+1
| * | | ARM: imx: eukrea-cpuimx51: remove boardEric Bénard2012-05-081-30/+0
| * | | ARM: imx: eukrea_mbimxsd35: add spi controler and spidev supportEric Bénard2012-05-081-0/+1
| * | | ARM: imx: eukrea_cpuimx25: add watchdog supportEric Bénard2012-05-081-0/+1
| * | | ARM: imx: eukrea_mbimxsd25: add spi controler and spidev supportEric Bénard2012-05-081-0/+1
| |/ /
* | | Merge tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-221-0/+2
|\ \ \ | | |/ | |/|
| * | ARM: imx6q: switch to use pinctrl subsystemDong Aisheng2012-05-081-0/+2
| |/
* | arm: imx: add missing select IMX_HAVE_PLATFORM for MACH_MX35_3DS in KconfigMarc Kleine-Budde2012-04-261-0/+2
|/
* 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
| |/ /
OpenPOWER on IntegriCloud