summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge branch 'next/fixes' into next/cleanupArnd Bergmann2011-10-314-57/+3
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'depends/rmk/memory_h' into next/fixesArnd Bergmann2011-10-312-25/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| * | | | | | Merge branch 'imx-cleanups-for-arnd' of git://git.pengutronix.de/git/imx/linu...Arnd Bergmann2011-10-203-3/+3
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | ARM: mach-mxs: fix machines' initializers orderLauri Hintsala2011-10-183-3/+3
| | | |_|/ / | | |/| | |
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanupSascha Hauer2011-10-043-47/+22
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | ARM: mxs: Consolidate mm-mx23.c and mm-mx28.c into a single fileFabio Estevam2011-10-043-47/+22
| | |/ / / /
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanupSascha Hauer2011-09-201-12/+11
| |\ \ \ \ \ \ | | | |/ / / /
| | * | | | | ARM: mach-mxs/mx28evk: Only register devices if their GPIO requests succeededFabio Estevam2011-09-201-12/+11
| | | | | | |
| | \ \ \ \ \
| *-. \ \ \ \ \ Merge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', 'clean...Sascha Hauer2011-08-265-7/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | |_|/ / / / | |/| | | | |
| | | * | | | arm/mxs: move MXS_GPIO_NR into mach/mxs.hShawn Guo2011-08-171-2/+0
| | | * | | | gpio/mxs: move irq_to_gpio() into gpio-mxs driverShawn Guo2011-08-172-2/+2
| | |/ / / / | |/| | | |
| | * | | | ARM: mxs: Remove unused header fileFabio Estevam2011-08-173-3/+0
| |/ / / /
* | | | | Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'depends/rmk/memory_h' into next/fixesArnd Bergmann2011-11-012-25/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| * | | | Merge branch 'depends/rmk/gpio' into next/fixesArnd Bergmann2011-10-311-8/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | ARM: i.MX28: shift frac value in _CLK_SET_RATEMatt Burtch2011-10-251-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kern...Linus Torvalds2011-10-282-25/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | ARM: mach-mxs: remove mach/memory.hNicolas Pitre2011-10-131-24/+0
| * | | ARM: add an extra temp register to the low level debugging addruart macroNicolas Pitre2011-09-261-1/+1
| |/ /
* | | Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2011-10-271-8/+0
|\ \ \ | | |/ | |/|
| * | ARM: gpio: make trivial GPIOLIB implementation the defaultRussell King2011-08-121-3/+0
| * | ARM: gpio: consolidate gpio_to_irqRussell King2011-08-121-1/+0
| * | ARM: gpio: consolidate trivial gpiolib implementationsRussell King2011-08-121-5/+1
| |/
* | ARM: 7022/1: allow to detect conflicting zreladdrsSascha Hauer2011-10-171-1/+1
|/
* Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-07-263-0/+29
|\
| * arm: mxs: add mmc-device for mach-tx28Wolfram Sang2011-07-072-0/+7
| * ARM: mxs/mx28evk: add leds-gpio device for heartbeatShawn Guo2011-07-072-0/+22
| * Merge remote-tracking branch 'grant/gpio/next-mx' into devel-featuresSascha Hauer2011-07-0710-369/+68
| |\
* | \ Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-07-261-7/+0
|\ \ \
| * | | ARM: Consolidate the clkdev header filesKyungmin Park2011-07-191-7/+0
* | | | Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-07-252-3/+3
|\ \ \ \ | | |/ / | |/| |
| * | | ARM: mxs/tx28: convert to new leds-gpio registration helperUwe Kleine-König2011-07-072-3/+3
* | | | Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2011-07-253-8/+3
|\ \ \ \
| * \ \ \ Merge branch 'fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 i...Arnd Bergmann2011-07-151-0/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | ARM: mxs-dma: include <linux/dmaengine.h>Dong Aisheng2011-07-151-0/+2
| | |/ /
| * | | ARM: mxs/tx28: according to the TX28's datasheet D4-D7 are not used for MMC0Uwe Kleine-König2011-07-071-8/+0
| * | | ARM i.MX23/28: platform-mxsfb: Add missing include of linux/dma-mapping.hAxel Lin2011-07-071-0/+1
| |/ /
* | | Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2011-07-2210-369/+68
|\ \ \ | | |/ | |/|
| * | gpio/mxs: Change gpio-mxs into an upstanding gpio driverShawn Guo2011-06-066-2/+67
| * | gpio/mxs: Move Freescale mxs gpio driver to drivers/gpioGrant Likely2011-06-064-367/+1
* | | net: remove mm.h inclusion from netdevice.hAlexey Dobriyan2011-06-213-0/+3
| |/ |/|
* | arm: mxs: include asm/processor.h for cpu_relax()Wolfram Sang2011-06-061-0/+2
|/
* Merge branch 'devel-stable' into for-linusRussell King2011-05-239-12/+14
|\
| * Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev...Russell King2011-05-208-11/+13
| |\
| | * mx23: register clocks for mmcPeter Korsgaard2011-05-191-0/+2
| | * arm: mach-imx/mxs: drop 'default' boardsWolfram Sang2011-05-191-2/+0
| | * ARM: mxs: fix naming of struct holding info for mxs-i2c devicesUwe Kleine-König2011-05-193-5/+7
| | * ARM: mxs/i.MX23: make i2c defines consistent and match the reference manualWolfram Sang2011-05-191-1/+1
| | * ARM: mxs/mach-mx2[38]evk: Set the initial value on gpio_request_oneFabio Estevam2011-05-192-3/+3
| * | Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into de...Russell King2011-05-071-1/+1
| |\ \ | | |/ | |/|
OpenPOWER on IntegriCloud