summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'imx/cleanup' into next/cleanupArnd Bergmann2011-10-203-2/+8
|\
| * Merge branch 'imx-cleanups-for-arnd' of git://git.pengutronix.de/git/imx/linu...Arnd Bergmann2011-10-206-5/+11
| |\
| | * arm/imx: explicitly includes mach/hardware.h in pm-imx27.cShawn Guo2011-10-171-1/+1
| | * arm/imx: remove mx27_setup_weimcs() from mx27.hShawn Guo2011-10-171-1/+3
| | * arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.cShawn Guo2011-10-171-0/+1
| | * arm/imx: remove mx31_setup_weimcs() from mx31.hShawn Guo2011-10-171-1/+4
* | | Merge branch 'depends/rmk/devel-stable' into next/cleanupArnd Bergmann2011-10-0826-27/+27
|\ \ \
| * \ \ Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stableRussell King2011-09-163-3/+3
| |\ \ \ | | | |/ | | |/|
| * | | ARM: mach-imx: convert boot_params to atag_offsetNicolas Pitre2011-08-2126-27/+27
* | | | Merge branch 'imx/cleanup' into next/cleanupArnd Bergmann2011-10-076-260/+259
|\ \ \ \ | | |_|/ | |/| |
| | | |
| | \ \
| *-. \ \ Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanupSascha Hauer2011-10-046-260/+259
| |\ \ \ \ | | | |/ /
| | * | | arm/imx: remove cpu_is_xxx() check from __imx_ioremap()Shawn Guo2011-10-041-0/+19
| | * | | arm/imx: remove cpu_is_xxx() from arch_idle()Shawn Guo2011-10-042-1/+31
| | * | | arm/imx: change mxc_init_l2x0() to an imx31/35 specific callShawn Guo2011-09-283-57/+38
| | * | | arm/imx: rename mm-imx31.c to mm-imx3.cShawn Guo2011-09-282-2/+2
| | * | | arm/imx: merge mm-imx35.c into mm-imx31.cShawn Guo2011-09-283-110/+79
| | |/ /
* | | | Merge branch 'samsung/cleanup' into next/cleanupArnd Bergmann2011-09-203-3/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | ARM: 7051/1: cpuimx* boards: fix mach-types errorsEric Bénard2011-08-223-3/+3
| |/
| |
| \
| \
| \
*---. \ Merge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', 'clean...Sascha Hauer2011-08-266-29/+20
|\ \ \ \ | |_|_|/ |/| | |
| | | * ARM: imx/armadillo5x0: dynamically allocate physmap-flash deviceUwe Kleine-König2011-08-011-11/+7
| | | * ARM: imx/mx1ads: dynamically allocate physmap-flash deviceUwe Kleine-König2011-08-011-10/+5
| | * | arm/mxc: do not use gpio_to_irq() for static initializersShawn Guo2011-08-163-3/+3
| |/ / |/| |
| * | ARM i.MX: remove ARCH_MX* macros from MakefileSascha Hauer2011-08-261-5/+5
|/ /
* | Merge commit 'v3.1-rc1' into imx-fixesSascha Hauer2011-08-0847-220/+438
|\ \ | |/
| * dmaengine: imx-sdma: use platform_device_id to identify sdma versionShawn Guo2011-07-276-9/+8
| * mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx()Shawn Guo2011-07-272-5/+5
| * mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5Shawn Guo2011-07-274-2/+8
| * net/fec: gasket needs to be enabled for some i.mxShawn Guo2011-07-273-3/+4
| * serial/imx: get rid of the uses of cpu_is_mx1()Shawn Guo2011-07-276-26/+30
| * Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-07-267-1/+198
| |\
| | * Enable RTC driver.Jürgen Lambrecht2011-07-071-1/+2
| | * dmaengine: imx-sdma: pass sdma firmware name via platform dataShawn Guo2011-07-073-8/+13
| | * ARM: mxc: clean up imx-dma device registrationShawn Guo2011-07-075-0/+100
| | * ARM: mach-imx/mx27_3ds: Add touchscreen supportFabio Estevam2011-07-071-1/+1
| | * ARM: mach-imx/mx27_3ds: Add LCD supportFabio Estevam2011-07-072-0/+91
| | * ARM: imx2: Fix GPIO iosizeFabio Estevam2011-07-073-16/+20
| | * Merge remote-tracking branch 'grant/gpio/next-mx' into devel-featuresSascha Hauer2011-07-0735-56/+107
| | |\
| * | \ Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-07-2512-111/+42
| |\ \ \ | | |/ /
| | * | ARM: mach-imx/mx27_3ds: Do not annotate the chip select as internalFabio Estevam2011-07-071-3/+3
| | * | ARM: mach-imx/mx27_3ds: Use the standard gpio_to_irq functionFabio Estevam2011-07-071-4/+5
| | * | ARM: mach-imx/scb9328: Make the UART gpio setup simplerFabio Estevam2011-07-071-14/+3
| | * | ARM: imx/mach-apf9328: Simplify UART0 registrationFabio Estevam2011-07-071-6/+1
| | * | ARM i.MX: get rid of wrong MXC_INTERNAL_IRQ usageSascha Hauer2011-07-071-1/+1
| | * | ARM i.MX: dmav1: kill SoC ifdefsSascha Hauer2011-07-071-22/+3
| | * | ARM i.MX: fix last user of iomux.h and remove itSascha Hauer2011-07-071-1/+1
| | * | ARM: imx: convert to new leds-gpio registration helperUwe Kleine-König2011-07-076-60/+25
| * | | Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2011-07-252-10/+29
| |\ \ \ | | |/ /
| | * | ARM: mach-imx/mx27_3ds: Fix regulator supportFabio Estevam2011-07-071-1/+20
| | * | ARM: mach-imx/mx31_3ds: Fix IOMUX for SPI1 signalsFabio Estevam2011-07-071-5/+5
| | * | ARM: mach-imx/mx27_3ds: Use the standard i.MX macro for GPIO numberingFabio Estevam2011-07-071-4/+4
OpenPOWER on IntegriCloud