summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'samsung/driver' into next/driversArnd Bergmann2012-01-093-24/+1
|\
| * Merge branch 'restart' into for-linusRussell King2012-01-052-2/+1
| |\
| | * ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| | * ARM: restart: mxs: use new restart hookRussell King2012-01-052-1/+4
| * | Merge branch 'devel-stable' into for-linusRussell King2012-01-051-22/+0
| |\ \ | | |/ | |/|
| | * ARM: big removal of now unused vmalloc.h filesNicolas Pitre2011-11-261-22/+0
* | | Merge branch 'omap/hwmod' into next/driversArnd Bergmann2011-12-272-2/+3
|\ \ \ | |/ /
| * | ARM: mx28: LRADC macro renamePeter Rusko2011-12-021-2/+2
| * | arm: mx23: recognise stmp378x as mx23Wolfram Sang2011-12-021-0/+1
| |/
* | ARM: mx28evk: add platform data for saifDong Aisheng2011-12-021-1/+3
* | ARM: mxs: add saif clkmux functionsDong Aisheng2011-12-022-0/+22
|/
* Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-10/+2
|\
| * arm/imx: use Kconfig choice for low-level debug UART selectionShawn Guo2011-10-171-10/+2
* | Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-0/+12
|\ \
| * \ Merge branch 'depends/rmk/gpio' into next/develArnd Bergmann2011-10-311-31/+1
| |\ \
| * \ \ Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linu...Arnd Bergmann2011-10-202-0/+2
| |\ \ \
| * \ \ \ Merge branch 'imx/cleanup' into imx/develArnd Bergmann2011-10-072-4/+2
| |\ \ \ \
| * | | | | ARM: mxs: add saif deviceDong Aisheng2011-08-231-0/+12
| | |_|_|/ | |/| | |
* | | | | Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-012-0/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'depends/rmk/devel-stable' into next/boardArnd Bergmann2011-11-012-25/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'depends/rmk/gpio' into next/boardArnd Bergmann2011-10-211-8/+0
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | |
| * | | | | ARM: mxs: Add initial support for DENX MX28Stefano Babic2011-10-132-0/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'next/fixes' into next/cleanupArnd Bergmann2011-10-313-56/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'depends/rmk/memory_h' into next/fixesArnd Bergmann2011-10-312-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
| | |/
| * | 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/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
|/
* 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/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2011-07-251-0/+2
|\ \
| * | ARM: mxs-dma: include <linux/dmaengine.h>Dong Aisheng2011-07-151-0/+2
| |/
* | gpio/mxs: Change gpio-mxs into an upstanding gpio driverShawn Guo2011-06-061-0/+2
|/
* Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev...Russell King2011-05-202-3/+4
|\
| * ARM: mxs: fix naming of struct holding info for mxs-i2c devicesUwe Kleine-König2011-05-191-2/+3
| * ARM: mxs/i.MX23: make i2c defines consistent and match the reference manualWolfram Sang2011-05-191-1/+1
* | Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into de...Russell King2011-05-071-1/+1
|\ \ | |/ |/|
| * ARM: zImage: remove the static qualifier from global data variablesNicolas Pitre2011-05-071-1/+1
* | ARM: mxs: dynamically allocate mmc deviceShawn Guo2011-03-251-0/+13
|/
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy...Linus Torvalds2011-03-221-0/+26
|\
| * dmaengine: mxs-dma: add dma support for i.MX23/28Shawn Guo2011-03-021-0/+26
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb...Linus Torvalds2011-03-181-0/+18
|\ \
| * | mmc: mxs-mmc: add mmc host driver for i.MX23/28Shawn Guo2011-03-151-0/+18
* | | ARM: mxs: make ssp error irq definition consistentShawn Guo2011-03-072-5/+5
* | | ARM: mxs: add dma channel definitionsShawn Guo2011-03-072-0/+61
* | | ARM: mxs: fix typo "GPO" in iomux-mx23.hShawn Guo2011-03-071-95/+95
* | | ARM: mxs: add helper macro for pad controlShawn Guo2011-03-071-0/+3
OpenPOWER on IntegriCloud